Browse code Merge branch 'stable' into master # Conflicts: # src/main/java/net/minecraft/world/WorldServer.java # src/main/java/net/minecraft/world/chunk/Chunk.java master mfnd
commit 25cbb340b0be9de574f4d2b1c07204f07af02c6c 2 parents acc8e88 + 8d41ae3 vlad20012 authored on 16 Feb 2017

Showing 24 changed files

• build.gradle
• buildSrc/src/main/java/org/ultramine/gradle/task/SpeicialClassTransformTask.java
• gradle.properties
• gradle/wrapper/gradle-wrapper.jar
• gradle/wrapper/gradle-wrapper.properties
• gradlew
• gradlew.bat
• src/main/java/net/minecraft/entity/Entity.java
• src/main/java/net/minecraft/entity/EntityCreature.java
• src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
• src/main/java/net/minecraft/nbt/CompressedStreamTools.java
• src/main/java/net/minecraft/world/World.java
• src/main/java/net/minecraft/world/WorldServer.java
• src/main/java/net/minecraft/world/chunk/Chunk.java
• src/main/java/net/minecraftforge/common/DimensionManager.java
• src/main/java/org/ultramine/server/Teleporter.java
• src/main/java/org/ultramine/server/chunk/PendingBlockUpdate.java
• src/main/java/org/ultramine/server/data/NBTFileDataProvider.java
• src/main/java/org/ultramine/server/internal/LambdaHolder.java
• src/main/java/org/ultramine/server/util/AsyncIOUtils.java
• src/main/java/org/ultramine/server/util/WeakObjectPool.java
• src/main/java/org/ultramine/server/world/WorldDescriptor.java
• src/main/resources/assets/ultramine/lang/en_US.lang
• src/main/resources/assets/ultramine/lang/ru_RU.lang

Ignore Space Show notes View build.gradle

Ignore Space Show notes View buildSrc/src/main/java/org/ultramine/gradle/task/SpeicialClassTransformTask.java

Ignore Space Show notes View gradle.properties

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.jar
Not supported

Ignore Space Show notes View gradle/wrapper/gradle-wrapper.properties

Ignore Space Show notes View gradlew

Ignore Space Show notes View gradlew.bat

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

Ignore Space Show notes View src/main/java/net/minecraft/entity/EntityCreature.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/nbt/CompressedStreamTools.java

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/java/org/ultramine/server/util/WeakObjectPool.java 0 → 100644

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

Ignore Space Show notes View src/main/resources/assets/ultramine/lang/en_US.lang

Ignore Space Show notes View src/main/resources/assets/ultramine/lang/ru_RU.lang

Show line notes below