Merge branch 'master-1.9' into master-1.11

Conflicts:
	build.properties
	src/main/resources/assets/structuredcrafting/lang/en_US.lang

Author: rubensworks

build.properties

@@ -2,5 +2,5 @@ mod_version=0.1.6
 minecraft_version=1.11.2
 forge_version=13.20.0.2201
 mcp_mappings_version=snapshot_20161206
-cyclopscore_version=0.9.0-453
+cyclopscore_version=0.9.0-472
 release_type=release

resources/changelog/1.9.4-0.1.7.txt

@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 0.9.0 or higher.
+
+Additions:
+* Added localization for configuration gui
+* Added config GUI restriction

src/main/java/org/cyclops/structuredcrafting/GeneralConfig.java

@@ -18,7 +18,7 @@ public class GeneralConfig extends DummyConfig {
      * The current mod version, will be used to check if the player's config isn't out of date and
      * warn the player accordingly.
      */
-    @ConfigurableProperty(category = ConfigurableTypeCategory.CORE, comment = "Config version for " + Reference.MOD_NAME +".\nDO NOT EDIT MANUALLY!")
+    @ConfigurableProperty(category = ConfigurableTypeCategory.CORE, comment = "Config version for " + Reference.MOD_NAME +".\nDO NOT EDIT MANUALLY!", showInGui = false)
     public static String version = Reference.MOD_VERSION;
 
     /**

src/main/resources/assets/structuredcrafting/lang/en_US.lang

@@ -3,3 +3,21 @@ itemGroup.structuredcrafting=Structured Crafting
 
 # Blocks
 tile.blocks.structuredcrafting.structured_crafter.name=Structured Crafter
+
+# Configuration
+config.structuredcrafting=%s configuration
+
+## Config categories
+config.structuredcrafting.block=Block settings
+config.structuredcrafting.block.tooltip=Block settings
+config.structuredcrafting.general=General settings
+config.structuredcrafting.general.tooltip=General settings
+config.structuredcrafting.core=Core settings
+config.structuredcrafting.core.tooltip=Core settings
+
+## Core settings
+config.structuredcrafting.general.analytics=Send anonymous analytics
+config.structuredcrafting.general.crashOnInvalidRecipe=Crash on invalid Recipe
+config.structuredcrafting.general.debug=Develop mode
+config.structuredcrafting.general.version=Version
+config.structuredcrafting.general.versionChecker=Version check