18 Commits
Author SHA1 Message Date
CovertJaguar 2565eea5ba Set version to 3.4 2015-01-17 20:44:55 -08:00
CovertJaguar d3e87b1aaf Merge branch 'dev' into release_3.4
Conflicts:
	application.properties
	src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java
	src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java
	src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java
	src/main/java/forestry/apiculture/worldgen/HiveDecorator.java
	src/main/java/forestry/apiculture/worldgen/HiveForest.java
	src/main/java/forestry/apiculture/worldgen/HiveGen.java
	src/main/java/forestry/apiculture/worldgen/HiveGenHelper.java
	src/main/java/forestry/apiculture/worldgen/HiveMeadows.java
	src/main/java/forestry/apiculture/worldgen/HiveSnow.java
	src/main/java/forestry/apiculture/worldgen/HiveSwamp.java
	src/main/java/forestry/apiculture/worldgen/HiveSwarmer.java
	src/main/java/forestry/core/gui/ContainerForestry.java
	src/main/java/forestry/core/utils/RecipeUtil.java
	src/main/java/forestry/factory/gadgets/TileWorktable.java
	src/main/java/forestry/factory/gui/ContainerFabricator.java
	src/main/java/forestry/factory/gui/ContainerWorktable.java
	src/main/java/forestry/factory/recipes/RecipeMemory.java
2015-01-17 20:33:15 -08:00
mezz 122af6d72d Update developer forge 2015-01-14 22:38:37 -08:00
mezz fae3b3d24e Update development Forge version 2015-01-10 10:37:25 -08:00
mezz 3c5c624251 Update development Forge (not the required version) 2014-12-26 23:42:13 -08:00
CovertJaguar d4b8c6b503 Bump version 2014-12-15 07:45:25 -08:00
CovertJaguar 00771b1a42 Bump version 2014-11-30 17:22:40 -08:00
CovertJaguar fff02be71d Bump version to 3.2 2014-11-08 21:40:45 -08:00
CovertJaguar 547719b6df Bump version 2014-10-08 15:46:53 -07:00
CovertJaguar eb102ac7d7 Bump version 2014-10-08 15:46:13 -07:00
CovertJaguar 9a1888e85c Update application.properties 2014-10-06 08:47:42 -07:00
CovertJaguar 23b1df18d4 Bump version 2014-09-26 00:44:43 -07:00
mezz 45bef1204a Change to forge 1207 for cauldron
#167
2014-09-04 21:06:58 -07:00
James Mitchell 0487cba409 Updated Forge to Latest based on recommendation of #minecraftforge on IRC 2014-09-03 17:18:03 -07:00
CovertJaguar 9a6e5f858d Bump version to 3.0, its a brand new world! 2014-08-18 13:11:08 -07:00
Player 5d0d0d7163 Fix some warnings, update Forge 2014-07-12 07:55:59 +02:00
Player 8e5d78d8cf 1.7.10 port - compiles, but likely still broken ingame 2014-07-12 06:43:59 +02:00
Player 23f21e78a6 Fix api submodule + build script 2014-05-04 03:18:29 +02:00