Browse code Merge branch 'stable' # Conflicts: # build.gradle master mfnd
commit 6b73ec1512ab680a1fd36a2079b5f36dd029c00a 2 parents afaa2e1 + 228c660 vlad20012 authored on 8 Dec 2016

Showing 15 changed files

• build.gradle
• src/main/java/net/minecraft/block/BlockLeaves.java
• src/main/java/net/minecraft/entity/EntityTrackerEntry.java
• src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
• src/main/java/net/minecraft/util/IntHashMap.java
• src/main/java/net/minecraft/util/LongHashMap.java
• src/main/java/net/minecraft/world/World.java
• src/main/java/net/minecraftforge/common/ForgeHooks.java
• src/main/java/org/ultramine/commands/CommandContext.java
• src/main/java/org/ultramine/commands/basic/BasicCommands.java
• src/main/java/org/ultramine/commands/basic/TechCommands.java
• src/main/java/org/ultramine/server/ServerLoadBalancer.java
• src/main/java/org/ultramine/server/bootstrap/log4j/UMStripColorsRewritePolicy.java
• src/main/java/org/ultramine/server/util/MinecraftUtil.java
• src/main/java/org/ultramine/server/util/VanillaChunkHashMap.java

Ignore Space Show notes View build.gradle

Ignore Space Show notes View src/main/java/net/minecraft/block/BlockLeaves.java

Ignore Space Show notes View src/main/java/net/minecraft/entity/EntityTrackerEntry.java

Ignore Space Show notes View src/main/java/net/minecraft/entity/player/EntityPlayerMP.java

Ignore Space Show notes View src/main/java/net/minecraft/util/IntHashMap.java

Ignore Space Show notes View src/main/java/net/minecraft/util/LongHashMap.java

Ignore Space Show notes View src/main/java/net/minecraft/world/World.java

Ignore Space Show notes View src/main/java/net/minecraftforge/common/ForgeHooks.java

Ignore Space Show notes View src/main/java/org/ultramine/commands/CommandContext.java

Ignore Space Show notes View src/main/java/org/ultramine/commands/basic/BasicCommands.java

Ignore Space Show notes View src/main/java/org/ultramine/commands/basic/TechCommands.java

Ignore Space Show notes View src/main/java/org/ultramine/server/ServerLoadBalancer.java

Ignore Space Show notes View src/main/java/org/ultramine/server/bootstrap/log4j/UMStripColorsRewritePolicy.java

Ignore Space Show notes View src/main/java/org/ultramine/server/util/MinecraftUtil.java

Ignore Space Show notes View src/main/java/org/ultramine/server/util/VanillaChunkHashMap.java

Show line notes below