mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
This commit is contained in:
commit
84336ec4d1
571 files changed
+10295
-4773
No files matched your search
@@ -14,7 +14,6 @@ import mekanism.client.gui.GuiCredits;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.Version;
|
||||
import mekanism.common.base.IModule;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
Reference in new issue
Block a user