mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into v8
Conflicts: build.properties src/main/java/mekanism/api/gas/GasNetwork.java src/main/java/mekanism/api/transmitters/DynamicNetwork.java src/main/java/mekanism/client/ClientTickHandler.java src/main/java/mekanism/common/EnergyNetwork.java src/main/java/mekanism/common/FluidNetwork.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/recipe/RecipeHandler.java src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java src/main/java/mekanism/generators/common/MekanismGenerators.java src/main/java/mekanism/generators/common/block/BlockGenerator.java
This commit is contained in:
commit
50f7df5f98
31 files changed
+143
-150
No files matched your search
@@ -70,7 +70,7 @@ public class MekanismRenderer
|
||||
{
|
||||
for(EnumColor color : EnumColor.values())
|
||||
{
|
||||
colors[color.ordinal()] = event.map.registerIcon("mekanism:overlay/Overlay" + color.getLocalizedName().replace(" ", ""));
|
||||
colors[color.ordinal()] = event.map.registerIcon("mekanism:overlay/overlay_" + color.unlocalizedName);
|
||||
}
|
||||
|
||||
energyIcon = event.map.registerIcon("mekanism:LiquidEnergy");
|
||||
|
||||
Reference in new issue
Block a user