diff --git a/build.gradle b/build.gradle index a02f129..6686f46 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ import groovy.json.JsonOutput def mainVersion = "1.7" -def buildNumber = "35" +def buildNumber = "36" // For those who want the bleeding edge buildscript { @@ -96,7 +96,8 @@ dependencies { compileOnly "TechReborn:TechReborn-1.12:2.6.9.7:universal" compileOnly "RebornCore:RebornCore-1.12:3.2.+:universal" //Others - compileOnly 'com.elytradev:mirage:2.0.1-SNAPSHOT' + //TODO do something about this + // compileOnly 'com.elytradev:mirage:2.0.1-SNAPSHOT' compileOnly "mezz.jei:jei_1.12:4.+" compileOnly "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.8.460" diff --git a/changelog.json b/changelog.json index d7712da..eb35e7c 100644 --- a/changelog.json +++ b/changelog.json @@ -5,8 +5,8 @@ "1.10.2-recommended": "1.4-18", "1.11.2-latest": "1.5-19", "1.11.2-recommended": "1.5-19", - "1.12.2-latest": "1.7-35", - "1.12.2-recommended": "1.7-35" + "1.12.2-latest": "1.7-36", + "1.12.2-recommended": "1.7-36" }, "1.10.2": { "1.1-3": " - fixed incompatibility with IE build 48\n - reduced the amount of calls to core IE classes to make such incompatibilities less likely\n - fixed localization of the creative tab", @@ -45,6 +45,7 @@ "1.7-32": " - Fixed connectors not rendering properly without IC2\n - Fixed parts of the mechanical multiblocks not rendering when Optifine is installed\n - Changed some values for the mechanical multiblock sound", "1.7-33": " - Fixed the Marx generator not processing ores\n - Fixed control panels and the Marx generator not working when connected directly\n - Added Russian translation (thanks @StolenSoda)", "1.7-34": " - Control panels can use the texture of any block now\n - Added a recipe to copy the settings of an unfinished control panel\n - The Marx generator now returns the wires used in its construction when disassembled\n - Fixed the RS controller for non-IE wires not keeping its IO state on world reload\n - Fixed control panels not working correctly with multiple controllers", - "1.7-35": " - Fixed a crash when placing certain items in the crafting grid" + "1.7-35": " - Fixed a crash when placing certain items in the crafting grid", + "1.7-36": " - Added an RGB indicator light, controlled by 3 (independent) RS signals\n - Fixed a bug allowing for unfinished control panels to be duplicated\n - Fixed insulated and uninsulated wire producing the same wire coils\n - Fixed some issues (including a crash) with the IE RS controller on dedicated servers" } } \ No newline at end of file diff --git a/changelog.md b/changelog.md index 51b3eaa..03a96a5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ ###Minecraft 1.12.2 +####Version 1.7-36 + - Added an RGB indicator light, controlled by 3 (independent) RS signals + - Fixed a bug allowing for unfinished control panels to be duplicated + - Fixed insulated and uninsulated wire producing the same wire coils + - Fixed some issues (including a crash) with the IE RS controller on dedicated servers + ####Version 1.7-35 - Fixed a crash when placing certain items in the crafting grid