mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge branch 'development' into 1.8.9
* development: Fixed Turbine Stats crash Fixed Turbine container crash Bumped version, fixed Steel Casing recipe, fixed erratic heat behavior, fixed Turbine render crash, added missing localization, fixed Bin crafting crash ja_JP.lang - translate generators and ores tooltip, fix some entries ja_JP.lang - translate general machinery and Blocks(without ores) tooltip. ja_JP.lang - little fix/change ja_JP.lang - fix/change some entries ja_JP.lang - translate tooltip and gui text ja_JP.lang - gui and tooltip translation progress ja_JP.lang - fix/change some translation(items and blocks) ja_JP.lang tweak some entries based on v9 Conflicts: src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/util/RecipeUtils.java
This commit is contained in:
commit
d5656b0264
15 files changed
+1129
-984
No files matched your search
@@ -111,13 +111,6 @@ public class MekanismRenderer
|
||||
{
|
||||
type.setIcon(event.map.registerSprite(type.iconResource));
|
||||
}
|
||||
|
||||
/*
|
||||
if(RenderPartTransmitter.getInstance() != null)
|
||||
{
|
||||
RenderPartTransmitter.getInstance().resetDisplayInts();
|
||||
}
|
||||
*/
|
||||
|
||||
RenderDynamicTank.resetDisplayInts();
|
||||
RenderThermalEvaporationController.resetDisplayInts();
|
||||
|
||||
Reference in new issue
Block a user