CovertJaguar
|
13ae9ece47
|
Fix submodule issues
|
2015-01-17 20:36:25 -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
|
8fe121f8b9
|
Use HTTPS for git subomdules
|
2014-12-24 13:42:10 -08:00 |
|
CovertJaguar
|
52994b2a39
|
Fix Lang submodule default url to use the github protocol.
|
2014-12-24 08:05:17 -08:00 |
|
CovertJaguar
|
b23167d468
|
Readd Forestry API correctly this time.
|
2014-12-24 07:31:59 -08:00 |
|
CovertJaguar
|
6d7f30ea6b
|
Remove Forestry API again because I derped it up
|
2014-12-24 07:30:42 -08:00 |
|
CovertJaguar
|
70d8d76934
|
Readd APIs as submodules
|
2014-12-24 07:28:20 -08:00 |
|
CovertJaguar
|
ca64f88113
|
Remove Forestry API in prep for adding RF API as a submodule (changing the directory tree)
|
2014-12-24 07:21:11 -08:00 |
|
Player
|
e3eef32f1c
|
Fix api submodule using ssh instead of (public) https.
|
2014-05-04 07:19:35 +02:00 |
|
Player
|
23f21e78a6
|
Fix api submodule + build script
|
2014-05-04 03:18:29 +02:00 |
|
Player
|
daa60e095a
|
Remove bogus api submodule
|
2014-05-04 02:29:51 +02:00 |
|
CovertJaguar
|
2b5359c515
|
Link the API and Lang repos, clean up build script, and expand info in readme about building
|
2014-05-02 14:11:53 -07:00 |
|