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
f85b534389
Move JEI items out of the way of ledgers
2016-02-22 23:57:06 -08:00
mezz
ab0d1cf7fc
Split block type from properties, combine definition and properties
2016-02-22 23:39:10 -08:00
Nedelosk
96170b5f21
Fix Crate Models
2016-02-21 18:56:06 +01:00
mezz
48c8c016b4
Tidy up JEI integration
2016-02-20 23:14:56 -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
c1e00ff395
Do not save player profile properties to nbt
2016-02-19 19:08:17 -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
9c40b03751
Tank should probably be a multiple of 2, derp.
2016-02-18 06:05:42 -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
Nirek-K
0876a50be2
Add missing null check to Growthcraft plugin.
2016-02-10 08:19:40 -06:00
mezz
bbd39ea5c7
Fix #1053 NPE when loading with old configs
2016-02-01 18:05:51 -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
Nirek-K
2cdee67624
Add Carrots equal to Apples in the squeezer(juice/mulch), potatoes at double fermenter rate of wheat (choice between pure fermenting, and seeds for seedoil)
2016-01-24 03:35:55 -06:00
Nirek-K
58fe331fe3
And missed one in HC too.
2016-01-24 03:17:37 -06:00
Nirek-K
a4d5117a97
Missed a check in BoP, also fix PlantMegaPack
2016-01-24 03:05:27 -06:00
Nirek-K
32a9a6ff5c
Fix #1051 Check for Farming module before adding BoP and Harvestcraft crops.
2016-01-24 02:19:15 -06:00
Nedelosk
02ec97b031
Clean Up and Bug Fixes
2016-01-23 17:17:20 +01:00
Nedelosk
6390a0cd11
Fix JEI and remove Forge test mods
2016-01-23 00:19:21 +01:00
Nedelosk
5a3850c264
First 1.8.9 Version
2016-01-22 19:33:35 +01:00
mezz
9f2f2ed85b
Fix #1043 Crash from mods spawning wood items with wildcard metadata
2016-01-15 20:07:54 -08:00
mezz
e0c1c538aa
Fix ClientTickEvent crash on disconnect from server
2016-01-10 21:04:35 -08:00
mezz
825768e522
Fix naturalist's eye lag on multiplayer servers
2016-01-01 11:55:39 -08: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
ff7adac9e1
Fix #1001 Slabs can't combine on placement in same block
2015-12-30 04:34:23 -08:00
mezz
45993f8213
Fix #999 Forestry Wood Logs Placement Issue
2015-12-30 02:31:19 -08:00
mezz
33573fea20
Fix #1022 Indistinguishable pollination color for some tree species
2015-12-29 12:34:26 -08:00
mezz
178142bf7a
Fix #922 New tree branching generates non-connected logs
2015-12-29 11:17:42 -08:00
mezz
5d2aaea757
Fix #1008 Backpack superposition bug
2015-12-29 09:40:37 -08:00
mezz
fbb02e43f5
Limit packets from engines supplying power to nearly full receivers
2015-12-29 08:20:05 -08:00
mezz
896767ae1b
auto format
2015-12-23 23:06:45 -08:00
mezz
cc64b09ad4
Fix #1017 crash when accessing bee cart gui
2015-12-22 17:44:38 -08:00
mezz
d5ebc02999
Fix BreedingTracker crash
2015-12-19 16:02:08 -08:00
mezz
8415b657f2
Use Forge 10.13.4.1566 fuel burn time workaround.
...
Fix #960 Fireproof wood have fuel value,
Fix #469 Burn time of wooden slabs should be 150 ticks
2015-12-13 13:47:55 -08:00
mezz
1ceccddbd0
Fix sync issues with researched mutations, use smaller packets
2015-12-12 22:51:59 -08:00
mezz
c2437a8a13
Fix #1009 Minor fluid dupe on right-clicking nearly-full machine
2015-12-12 18:08:40 -08:00
mezz
e2f32ab767
Sync mail to client on login, do not display mail indicator on logout
2015-12-12 17:45:12 -08:00