Mindustry/gradle.properties at 78f146fbcf98163a2aa2a2b69c3344ef1a0d0899 - Mindustry - Gitea: Git with a cup of tea

mirrors/Mindustry

mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 16:09:57 +07:00

Anuken 78f146fbcf Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/graphics/Shaders.java
#	gradle.properties

2019-12-01 17:42:56 -05:00

4 lines

110 B

INI

Raw Blame History

	`org.gradle.daemon=true`
	`org.gradle.jvmargs=-Xms256m -Xmx1024m`
	`archash=58bfbdbe4446ca80d133a87cdffee249070ab32d`