Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry

# Conflicts: # core/src/io/anuke/mindustry/content/Blocks.java # gradle.properties
2019-12-08 00:15:42 -05:00
parent ccca26d98f 477ebc91bf
commit 268f3cc3c2
98 changed files with 910 additions and 337 deletions
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -26,6 +26,7 @@ load.image = Images
 load.content = Content
 load.system = System
 load.mod = Mods
+load.scripts = Scripts

 schematic = Schematic
 schematic.add = Save Schematic...