Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts: src/main/java/techreborn/asm/LoadingPlugin.java src/main/java/techreborn/client/gui/GuiBlastFurnace.java src/main/java/techreborn/client/render/MultiblockRenderEvent.java src/main/java/techreborn/compat/recipes/RecipesIC2.java src/main/java/techreborn/init/ModItems.java src/main/java/techreborn/lib/Location.java src/main/java/techreborn/packets/PacketPipeline.java src/main/java/techreborn/partSystem/fmp/CableConverter.java
This commit is contained in:
commit
ef03cf50a9
23 changed files with 888 additions and 654 deletions
|
@ -7,7 +7,7 @@ import techreborn.client.StackToolTipEvent;
|
|||
import techreborn.client.VersionCheckerClient;
|
||||
import techreborn.client.hud.ChargeHud;
|
||||
import techreborn.client.keybindings.KeyBindings;
|
||||
import techreborn.client.render.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
|
||||
public class ClientProxy extends CommonProxy {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue