Commit Graph
389 Commits
Author SHA1 Message Date
mezz d4cfbe9f29 Comment out broken BoP compatibility 2016-06-02 02:54:01 -07:00
mezz afbde2d735 Fix #1186 Begin farm cleanup and testing 2016-05-22 03:31:02 -07:00
mezz 78a955e3ea Fix #1198 Missing item textures for engines 2016-05-19 15:57:24 -07:00
mezz ff1ff5ae2c Put Facing on blockstate not Tile. Use one block per type for BlockBase 2016-05-18 23:44:03 -07:00
mezz 9d9ea95ed1 Close #1154 add dungeon loot 2016-05-13 01:50:49 -07:00
mezz 99646e8656 Fix crash with BoP integration 2016-05-12 01:56:40 -07:00
Nedelosk 898860975a CleanUp, improven Crate Model, and add IModelState parameter to the model baker 2016-05-06 19:00:58 +02:00
mezz 7bf554b024 Compiles for 1.9! Very buggy, some things are missing. 2016-05-05 01:11:21 -07:00
mezz 5d74c1254b More porting to 1.9 2016-05-04 21:15:23 -07:00
mezz a0cdaf1e1a More porting to 1.9 2016-05-04 01:02:43 -07:00
mezz 73c2608848 First steps porting to 1.9 2016-05-03 00:26:28 -07:00
mezz c47acd803c Register crates without specifying a UID 2016-05-01 17:31:37 -07:00
mezz b97151c56b Close #940 Improve backpack configs, allow regex oreDict names 2016-05-01 09:19:25 -07:00
mezz 1d8f2dae66 Use Translator.java for all translation 2016-04-30 02:32:44 -07:00
Nedelosk 43ac71b022 Fix #1147, Fix #1146 2016-04-29 20:02:24 +02:00
mezz 08d543b2ef Close #1144 add IC2 compatibility back 2016-04-28 19:52:12 -07:00
Nedelosk bde92c4afc Add camouflage system, add greenhouse door and clean up 2016-03-13 21:00:45 +01:00
Nedelosk 9a0e5dc3e3 Add Basic Greenhouse 2016-03-12 21:43:13 +01:00
mezz 0049d1e20d Convert woods to normal blocks, no tile entities 2016-03-09 23:47:58 -08:00
mezz 70c5e851c2 Clean up liquids and liquid containers. Use Forge's universal bucket 2016-03-06 14:53:19 -08:00
mezz 4677ae7d54 Fix logs, load order and GameMode loading 2016-03-04 03:54:32 -08:00
mezz 2d4c180389 Clean up backpack API 2016-03-04 02:38:23 -08:00
mezz 5a78f97fcb Remove optifine/gregtech/bukkit warning from crash log reports 2016-03-04 01:02:53 -08:00
mezz ff076090e3 Move plugins to their respective folders 2016-03-04 00:44:50 -08:00
mezz 626d0d8fb5 Use the generic types now available in 1.8+. remove warning suppressions 2016-03-04 00:36:47 -08:00
mezz 2ddad6ec37 Hide some items from JEI 2016-03-04 00:08:40 -08:00
mezz 6d2313b251 Rename species helpers to species roots 2016-03-03 22:11:39 -08:00
mezz 5a901ffa36 Make SpeciesCustom classes into SpeciesBuilder 2016-03-03 21:46:21 -08:00
mezz efcab41e04 Revert "Use generics for Chromosome type, begin unifying code"
This reverts commit 43e41034f6.

Conflicts:
	src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
	src/main/java/forestry/core/proxy/ProxyRenderClient.java
2016-03-03 20:50:38 -08:00
mezz 43e41034f6 Use generics for Chromosome type, begin unifying code 2016-02-27 00:14:22 -08:00
mezz a8270ef365 Remove lots of legacy handling code 2016-02-26 21:49:04 -08:00
mezz 7b0259a343 Cleanup Log, loading from nbt, remove Version check 2016-02-25 19:18:50 -08:00
mezz 14c42afd29 Automatic code reformatting. Makes everything formatted the same way 2016-02-25 19:18:50 -08:00
mezz 406392e7f7 Begin code cleanup for generics, types, warnings, nulls, and spelling 2016-02-25 19:11:29 -08:00
Nedelosk c9b2f7bd3e Model System Clean Up 2016-02-25 21:44:36 +01:00
mezz 78d836bc1f Remove most deprecated things 2016-02-25 04:45:19 -08:00
mezz 65436a4e70 Use ForestryPlugin annotation to discover plugins 2016-02-25 04:17:33 -08:00
Nedelosk 28502d23e0 Fix Crate Models and other Models 2016-02-24 21:57:20 +01:00
mezz ab0d1cf7fc Split block type from properties, combine definition and properties 2016-02-22 23:39:10 -08:00
mezz 8da0c0dc95 Get things compiling.
Move ForestryAPI into the Forestry project instead of as a submodule
Include the new RF API
Remove code for mods that have not yet ported to 1.8.9 (add it back later)
Bump version to 5.0.0
2016-02-20 19:51:49 -08:00
mezz 73812d8765 Merge branch 'dev' into mc-1.8.9
# Conflicts:
#	gradle.properties
#	src/main/java/forestry/arboriculture/render/IconProviderWood.java
#	src/main/java/forestry/core/access/AccessHandler.java
#	src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java
#	src/main/java/forestry/farming/logic/FarmLogicOrchard.java
#	src/main/java/forestry/plugins/compat/PluginGrowthCraft.java
#	src/main/java/forestry/plugins/compat/PluginHarvestCraft.java
#	src/main/java/forestry/plugins/compat/PluginPlantMegaPack.java
#	src/main/java/forestry/plugins/compat/PluginWitchery.java
2016-02-19 19:14:59 -08:00
Nirek-K 897123c883 Add missing Snow diplacable tags for plugin flowers. 2016-02-19 13:14:00 -06:00
Nirek-K 0ed33cf9a3 Increase wax cast durability to 16, Fabricator tank to 8, Add 4 to 4 Plain glass Fabrication recipe, change stamp defs to be oreDictionary. 2016-02-19 12:41:35 -06:00
Nirek-K 8ba8c0fb17 Forgot Sandstone had variants. Add variants->Fabricator. 2016-02-18 06:25:16 -06:00
Nirek-K 194c0a0e77 Add Red Sand, Sandstone to Fabricator->glass, slightly increase fabricator glasstank. 2016-02-18 05:51:30 -06:00
Nirek-K 77157aa9cb Add new pinecones from BoP to squeezable for seedoil. 2016-02-12 15:16:24 -06:00
Nirek-K f4681d251c Increase seed oil yield of Harvestcraft peanuts, and tree nuts to be slightly more viable oil sources. 2016-02-12 11:00:09 -06:00
mezz 6cd9f33c3f Close #1060 Close #1065 Disable Growthcraft plugin for version 2.5.0+ 2016-02-11 17:35:21 -08:00
Nirek-K 7585c6a265 Fix #1067 add module checks to BoP Plugin 2016-02-11 00:48:38 -06:00
Nirek-K 91a5084bde Further cleanup GC plugin nulls. 2016-02-10 15:29:26 -06:00