Commit Graph
235 Commits
Author SHA1 Message Date
Nedelosk afb3ee56dd Fix #1183 Portable alyzer, Fix #1185 Infuser GUI crash and Fix #1187 Crash when trying to break farm block 2016-05-17 16:16:39 +02:00
Nedelosk 4c83209eae Fix #1173 and Fix #1172 2016-05-15 09:25:33 +02:00
mezz 5cc181d4c7 Fix #1153 crash from interface methods named getWorld 2016-05-11 22:00:49 -07:00
mezz 0ae2e36e90 Fix #1112 Improve IItemHandler Integration and Backpack 2016-05-08 00:16:34 -07:00
mezz 7403a6cdcd Use new block and item registration 2016-05-06 17:27:16 -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 c30c3d7575 Use BlockPos and Vec3i, remove our Vect implementations 2016-05-06 02:18:03 -07:00
Nedelosk 66d6a4d75e Work on ModelBaker 2016-05-05 12:48:10 +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 a3363fb4bc Big code cleanup 2016-05-01 15:34:11 -07:00
mezz 1d8f2dae66 Use Translator.java for all translation 2016-04-30 02:32:44 -07:00
mezz 641dea32ac Fix #1145 blocks missing localization 2016-04-28 23:46:27 -07:00
Vexatos 01b1a9a33a Improved multiblock error messages.
For ForestryMC/Forestry-Localization#180.
2016-04-29 07:57:54 +02:00
mezz 08d543b2ef Close #1144 add IC2 compatibility back 2016-04-28 19:52:12 -07:00
Nedelosk c5fc804bfa CleanUp 2016-03-31 02:04:29 +02:00
Nedelosk cd4061b1fe Add clima manager and add greenhouse controller to multiblock logic factory 2016-03-19 16:11:22 +01:00
Nedelosk ad69242a40 Fix farm tiles 2016-03-17 22:08:39 +01:00
Nedelosk 4d2135aae8 Add default camouflage block and clean up 2016-03-17 20:59:24 +01:00
Nedelosk 3eaf9d4d30 Fix camouflage and add agriculture tab 2016-03-17 19:36:21 +01: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 dd65d083cc #1091 begin clean up for Alveary
Still needs to visually update when slabs are added or removed to the top
2016-03-12 01:07:01 -08:00
mezz 886591f710 Fix concurrency issues in ModelBaker 2016-03-11 22:12:05 -08:00
mezz a192c1ce49 Fix fruit pods 2016-03-11 20:21:52 -08:00
mezz 43cf636096 Fix #1094 Leaves crash. Split decorative leaves into their own block 2016-03-10 03:34:57 -08:00
Nedelosk 83e01c71a2 Clean Up 2016-03-06 23:20:03 +01:00
mezz 0b31054a58 Clean up uses of Blocks.air 2016-03-06 10:32:29 -08:00
mezz 92b1f85d84 Clean up bee nocturnal and rain tolerance 2016-03-04 03:53:44 -08:00
mezz ec53b6d882 Clean up exception catching 2016-03-04 01:42:17 -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 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
Nedelosk e0ea0c1073 Fix ModelBlockOverlay 2016-02-27 14:24:07 +01:00
mezz 43e41034f6 Use generics for Chromosome type, begin unifying code 2016-02-27 00:14:22 -08:00
Nedelosk 75bbf7e6a7 Improve Model Baker and Clean Up 2016-02-26 18:08:25 +01: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
mezz 65436a4e70 Use ForestryPlugin annotation to discover plugins 2016-02-25 04:17:33 -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
mezz 6cd9f33c3f Close #1060 Close #1065 Disable Growthcraft plugin for version 2.5.0+ 2016-02-11 17:35:21 -08:00
Nirek-K b9478e16b7 Add Orchard farmland, dirt traversal for ic2 plants. 2016-01-24 15:49:31 -06:00
Nedelosk 801c6dff92 Clean Up and Add Comments
A clean up and I add crates with the new blocks from 1.8.
2016-01-24 12:41:47 +01:00
Nedelosk 02ec97b031 Clean Up and Bug Fixes 2016-01-23 17:17:20 +01:00
Nedelosk 5a3850c264 First 1.8.9 Version 2016-01-22 19:33:35 +01:00
mezz 1d924d5ed5 Merge pull request #1004 from estebes/dev
Add IC2 crops support to multifarms (uses orchard farm logic)
2015-12-30 04:37:20 -08:00