mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-19 19:49:50 +00:00
Conflicts: build.gradle build.properties common/mekanism/common/network/PacketPortableTeleport.java common/mekanism/tools/common/MekanismTools.java etc/core/mcmod.info etc/generators/mcmod.info etc/tools/mcmod.info src/main/java/mekanism/common/EnergyNetwork.java src/main/java/mekanism/common/Mekanism.java src/main/java/mekanism/common/PacketHandler.java src/main/java/mekanism/common/network/PacketTransmitterUpdate.java src/main/java/mekanism/common/tile/TileEntityChargepad.java src/main/java/mekanism/common/tile/TileEntityEnergyCube.java src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java src/main/java/mekanism/generators/common/MekanismGenerators.java