Commit Graph
205 Commits
Author SHA1 Message Date
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
mezz 178142bf7a Fix #922 New tree branching generates non-connected logs 2015-12-29 11:17:42 -08:00
estebes 962a17494c Added IC2 crops support to multifarms (uses orchard farm logic) 2015-12-05 11:10:34 +00:00
mezz 3c7856f264 Add checking to make sure client and server can't open different GUIs 2015-11-20 09:49:55 -08:00
mezz 408a66bb40 Refactor GUI handling code 2015-11-19 20:37:33 -08:00
mezz 31231db459 minor cleanup 2015-11-19 16:42:30 -08:00
mezz 6cfae1462f Move farm blocks to PluginFarming.blocks 2015-11-19 01:04:37 -08:00
mezz 358522b2af Move tree blocks to PluginArboriculture.blocks 2015-11-19 01:04:36 -08:00
mezz ade9bb6940 Move core blocks to PluginCore.blocks 2015-11-19 01:04:36 -08:00
mezz e248f40f58 Move mod compatibility plugins into plugins/compat folder 2015-11-19 01:04:33 -08:00
mezz 0fe87253d1 Move core items to PluginCore.items (first of item/block refactor) 2015-11-19 01:04:31 -08:00
mezz 4f19f95b71 Clean up packet registration code 2015-11-19 01:04:31 -08:00
mezz c96f260abd Fix farms not spreading farmland after it has started 2015-11-17 03:06:32 -08:00
mezz f2b95e1777 Clean up farm itemEntity collection code 2015-11-17 02:19:35 -08:00
mezz d82db2f003 Fix #965 issues displaying multiblock owner ledgers 2015-11-16 22:50:41 -08:00
mezz 84b1fa8c07 Fix farms only planting brown mushrooms 2015-11-15 02:59:56 -08:00
mezz 723d07ab7c Use vanilla BigMushroom generation 2015-11-15 02:59:32 -08:00
mezz 5f2de3026e Clean up widgets and OpenGL gui lighting issues 2015-11-13 23:12:40 -08:00
mezz 430115a7d4 Refactor text layout from GuiForestry into its own class 2015-11-13 03:38:06 -08:00
mezz 731d15fbd5 Add API for multiblock components 2015-11-10 02:44:18 -08:00
mezz 14bdab069e Fix #879 Fix #957 Improve error messages, add habitat locator hint 2015-11-09 01:32:42 -08:00
mezz 56a9e84800 Fix Gui crash on server startup 2015-11-08 19:24:46 -08:00
mezz 411b4959f2 Move inventory code to their own files, refactor, cleanup.
Register items and blocks before the rest of preInit.
2015-11-05 04:47:04 -08:00
mezz eb0a55d91c Close #699 Add Beehouse Minecart 2015-11-03 01:07:20 -08:00
mezz 7a45ce35a3 Fix #937 Multifarm detects rain in rainless biomes 2015-10-31 20:41:36 -07:00
mezz 9a745b10d7 Fix #938 Squeezer tank level does not update unless gui interacted 2015-10-31 20:29:15 -07:00
mezz 1594edd4d4 Fix #936 Machines run too slowly 2015-10-31 01:40:13 -07:00
mezz 72fc7cee93 Fix crash from missing tile in TankManager 2015-10-30 01:29:44 -07:00
mezz 4796ea24bb Fix #691 Tank GUIs are not synced for multiple players at the same time 2015-10-30 01:05:22 -07:00
mezz 23271bab04 Fix #922 Multifarm does not harvest large tree branches 2015-10-27 00:55:48 -07:00
mezz d1328cff6c Fix #923 Alvearies get disconnected from pipes on server start 2015-10-27 00:13:54 -07:00