GitBucket
|
Merge remote-tracking branch 'Clean_Forge/master'
Conflicts: src/main/java/net/minecraft/network/NetHandlerPlayServer.java src/main/java/net/minecraft/server/management/PlayerManager.java src/main/java/net/minecraft/server/management/ServerConfigurationManager.java src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java src/main/java/net/minecraft/world/gen/ChunkProviderServer.java src/main/java/net/minecraftforge/common/DimensionManager.java |
|---|
|
|
| src/main/java/cpw/mods/fml/client/FMLClientHandler.java |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/Loader.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/deobf/FMLDeobfuscatingRemapper.java |
|---|
|
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/functions/CollectionWrapperFactory.java 0 → 100644 |
|---|
|
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/internal/FMLProxyPacket.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/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/ObjectHolderRef.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/cpw/mods/fml/common/registry/ObjectHolderRegistry.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/Block.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockDeadBush.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockDoublePlant.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockFlowerPot.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockIce.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockLeaves.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockNetherWart.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockNote.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockPistonMoving.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockPotato.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockStem.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/block/BlockTallGrass.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/Minecraft.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/gui/GuiScreen.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/network/NetHandlerLoginClient.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/network/NetHandlerPlayClient.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/RenderBlocks.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/renderer/ThreadDownloadImageData.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/renderer/WorldRenderer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/client/renderer/entity/RenderItem.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/EntityLivingBase.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/EntityTracker.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/EntityTrackerEntry.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/item/EntityEnderPearl.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/monster/EntityMagmaCube.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/passive/EntityHorse.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/entity/player/EntityPlayer.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/network/rcon/RConThreadClient.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/server/MinecraftServer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/server/management/ItemInWorldManager.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/server/management/PlayerManager.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/tileentity/TileEntityNote.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/util/AxisAlignedBB.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/util/HttpUtil.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/util/ObjectIntIdentityMap.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/biome/BiomeDecorator.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/biome/BiomeGenForest.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/biome/BiomeGenJungle.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/biome/BiomeGenSwamp.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/chunk/Chunk.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/chunk/storage/AnvilChunkLoader.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/chunk/storage/RegionFile.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/gen/ChunkProviderServer.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/gen/feature/WorldGenShrub.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/gen/feature/WorldGenTrees.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraft/world/gen/layer/GenLayer.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/EnumHelperClient.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 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/client/event/RenderWorldEvent.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/BiomeManager.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/DimensionManager.java |
|---|
|
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/IShearable.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/chunkio/ChunkIOExecutor.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/chunkio/QueuedChunk.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/util/AsynchronousExecutor.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/util/EnumHelper.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/common/util/RotationHelper.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/PlayerEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/FluidEvent.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/fluids/FluidTank.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/oredict/OreDictionary.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java |
|---|
|
Too large (Show diff)
|
| src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java |
|---|
|
Too large (Show diff)
|
| src/main/java/org/ultramine/server/chunk/AsynchronousExecutor.java 100644 → 0 |
|---|
|
Too large (Show diff)
|
| src/main/java/org/ultramine/server/chunk/ChunkIOExecutor.java 100644 → 0 |
|---|
|
Too large (Show diff)
|
| src/main/java/org/ultramine/server/chunk/ChunkIOProvider.java 100644 → 0 |
|---|
|
Too large (Show diff)
|
| src/main/java/org/ultramine/server/chunk/ChunkLoadCallbackRunnable.java 0 → 100644 |
|---|
|
Too large (Show diff)
|
| src/main/java/org/ultramine/server/chunk/QueuedChunk.java 100644 → 0 |
|---|
|
Too large (Show diff)
|
| src/main/resources/assets/forge/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)
|
| src/main/resources/lgpl-3.0.txt 0 → 100644 |
|---|
|
Too large (Show diff)
|