StevenRS11 5ba58dc91b Merge remote-tracking branch 'origin/master' into StevenRS ...

Conflicts:
	src/main/java/StevenDimDoors/mod_pocketDim/CraftingManager.java
	src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
	src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
	src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
	src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java

	src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
	src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
	src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
	src/main/java/StevenDimDoors/mod_pocketDimClient/RenderRift.java

2014-06-27 16:26:46 -04:00

gradle/wrapper

Added Gradle Wrapper

2013-12-17 03:48:27 -05:00

src/main

Merge remote-tracking branch 'origin/master' into StevenRS

2014-06-27 16:26:46 -04:00

build.gradle

Updated Version

2014-04-11 21:32:36 -04:00

build.xml.old

Created build.gradle

2013-12-17 03:36:38 -05:00

gradlew

Updated gradlew permissions

2013-12-17 19:31:34 -05:00

gradlew.bat

Added Gradle Wrapper

2013-12-17 03:48:27 -05:00

Description

No description provided

20 MiB

Languages

Java 100%