GitBucket
|
Merge remote-tracking branch 'Clean_Forge/master'
Conflicts: src/main/java/cpw/mods/fml/relauncher/CoreModManager.java src/main/java/net/minecraft/server/dedicated/DedicatedServer.java src/main/java/net/minecraft/world/WorldServer.java |
|---|
|
|
| build.gradle |
|---|
|
Too large (Show diff)
|
| conf/build.gradle.forge |
|---|
|
Too large (Show diff)
|
| conf/deobfuscateJar/deobfed.jar 0 → 100644 |
|---|
|
Too large (Show diff)
|
| conf/deobfuscateJar/transformed.json 0 → 100644 |
|---|
|
Too large (Show diff)
|
| conf/mcp.exc |
|---|
|
Too large (Show diff)
|
| conf/srg.exc |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/FMLClientHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/GuiDupesFound.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/GuiModsMissing.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiConfig.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiEditArray.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiSelectString.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/GuiSlider.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/client/config/IConfigElement.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/FMLCommonHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/FMLContainer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/ModClassLoader.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/ModContainerFactory.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/ModMetadata.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/TracingPrintStream.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/asm/FMLSanityChecker.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/asm/transformers/ItemStackTransformer.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/asm/transformers/ModAccessTransformer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/asm/transformers/TerminalTransformer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/discovery/ModDiscoverer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/event/FMLMissingMappingsEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/eventhandler/ASMEventHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/eventhandler/Event.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/eventhandler/EventBus.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/eventhandler/EventPriority.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/eventhandler/IEventExceptionHandler.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/eventhandler/ListenerList.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/launcher/Yggdrasil.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/internal/FMLMessage.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/internal/NetworkModHolder.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/ExistingSubstitutionException.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/GameData.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/GameRegistry.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/IncompatibleSubstitutionException.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/RegistryDelegate.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/versioning/VersionRange.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/relauncher/CoreModManager.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/relauncher/FMLRelaunchLog.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/relauncher/ModListHelper.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/server/FMLServerHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/Block.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/Minecraft.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/gui/GuiChat.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/gui/ServerListEntryNormal.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/gui/achievement/GuiAchievements.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/renderer/EntityRenderer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/renderer/ItemRenderer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/resources/LanguageManager.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/command/IAdminCommand.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/creativetab/CreativeTabs.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/enchantment/EnchantmentHelper.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/player/EntityPlayer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/projectile/EntityFishHook.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/inventory/ContainerBeacon.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/inventory/ContainerRepair.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/item/Item.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/item/ItemLilyPad.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/item/ItemStack.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/network/NetHandlerPlayServer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/network/PingResponseHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/server/dedicated/DedicatedServer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/tileentity/TileEntityBeacon.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/util/Session.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/World.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/WorldProvider.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/WorldServer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/chunk/Chunk.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/gen/layer/GenLayerBiome.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/client/ClientCommandHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/client/ForgeHooksClient.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/client/event/EntityViewRenderEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/BiomeDictionary.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/BiomeManager.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/FishingHooks.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/ForgeHooks.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/ForgeModContainer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/ForgeVersion.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/config/Configuration.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/util/BlockSnapshot.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/AnvilUpdateEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/ForgeEventFactory.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/entity/player/AnvilRepairEvent.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/entity/player/PlayerWakeUpEvent.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/world/BlockEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/Fluid.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/FluidStack.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java |
|---|
|
Too large (Show diff)
|
| src/main/resources/assets/fml/lang/en_US.lang |
|---|
|
Too large (Show diff)
|
| src/main/resources/fmlversion.properties |
|---|
|
Too large (Show diff)
|
| src/main/resources/forge.exc |
|---|
|
Too large (Show diff)
|
| src/main/resources/forge_at.cfg |
|---|
|
Too large (Show diff)
|