mezz
|
4228ef73d7
|
Merge branch 'dev' into 4.2
|
2015-12-03 11:29:37 -08:00 |
|
mezz
|
6b9614bccd
|
Fix #994 Peat-fired Engine no longer accepts Bituminous Peat
|
2015-12-03 10:07:51 -08:00 |
|
mezz
|
179311a390
|
Use 2 render passes for saplings (for addon saplings via tree api)
|
2015-12-03 10:02:08 -08:00 |
|
mezz
|
d8bcab07ba
|
Use 2 render passes for saplings (for addon saplings via tree api)
|
2015-12-03 10:01:27 -08:00 |
|
mezz
|
2368f05778
|
Merge branch 'dev' into 4.2
|
2015-12-03 10:00:08 -08:00 |
|
mezz
|
347e0a61e1
|
Fix #986 Forestry version of acacia sapling cannot be obtained
|
2015-11-26 20:15:12 -08:00 |
|
mezz
|
23792a84c1
|
Fix #983 farm block recipes are missing for most materials
|
2015-11-25 12:11:15 -08:00 |
|
mezz
|
b4c0777f1c
|
minor cleanup
|
2015-11-22 10:10:09 -08:00 |
|
mezz
|
db5daf9e3d
|
Tidy species code
|
2015-11-21 21:50:38 -08:00 |
|
mezz
|
a574eac903
|
Add custom colour provider for bee species colours
|
2015-11-21 21:27:21 -08:00 |
|
mezz
|
b3799c22e6
|
Fix #975 Crash with Storage Module disabled and Growthcraft
|
2015-11-21 20:46:17 -08:00 |
|
mezz
|
97d10fdba3
|
Fix MutationConditionRequiresResource
|
2015-11-21 16:04:18 -08:00 |
|
mezz
|
a4dd450ff8
|
Add mutation condition requireResource(String oreDictName)
|
2015-11-21 14:04:53 -08:00 |
|
mezz
|
8df8404a84
|
#976 Disable inventory tweaks shortcut buttons on Forestry inventories
|
2015-11-21 12:34:21 -08:00 |
|
mezz
|
54e73da1d5
|
Fix #979 Bio Generator crashing the game
|
2015-11-21 11:53:06 -08:00 |
|
mezz
|
7d83e28a03
|
Fix #977 add additional defensive checks to BeekeepingLogic
|
2015-11-21 11:24:35 -08:00 |
|
mezz
|
db7736f7d2
|
Add missing GUI classes to GuiIdRegistry
|
2015-11-21 11:24:00 -08:00 |
|
mezz
|
eff9dfcca7
|
Fix #978 missing localization keys for mail trades and escritoire
|
2015-11-21 11:06:12 -08:00 |
|
mezz
|
2b874fb42f
|
Use Multimaps.asMap to hide weird casting
|
2015-11-20 18:34:07 -08:00 |
|
mezz
|
27daa8e1ac
|
Add support for InventoryTweaks
|
2015-11-20 18:28:25 -08:00 |
|
mezz
|
a49eb1c5f9
|
Fix #524 Add config for Received letters HUD Placement
|
2015-11-20 15:31:21 -08:00 |
|
mezz
|
7e3b7acdef
|
Allow hotkeys to send items to hotbar, except locked slots
|
2015-11-20 12:05:10 -08:00 |
|
mezz
|
9c532dd076
|
Allow hotkeys to send items to hotbar, except locked slots
|
2015-11-20 12:04:49 -08:00 |
|
mezz
|
3de8bac1ad
|
Update minimum required Forge version to 10.13.4.1448
(cherry picked from commit 4c41d0bb6e)
|
2015-11-20 10:18:08 -08:00 |
|
mezz
|
abca8b13f3
|
Fix #972 tree growing logs with default properties instead using genome
(cherry picked from commit 67a7185261)
Conflicts:
src/main/java/forestry/arboriculture/genetics/TreeDefinition.java
|
2015-11-20 10:17:51 -08: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
|
67a7185261
|
Fix #972 tree growing logs with default properties instead using genome
|
2015-11-19 01:37:29 -08:00 |
|
mezz
|
aeaf113b11
|
Fix git capitalization derp
|
2015-11-19 01:24:57 -08:00 |
|
mezz
|
167e493160
|
Move butterfly blocks to PluginLepidopterology.blocks
remove custom shaped and shapeless recipes
|
2015-11-19 01:04:39 -08:00 |
|
mezz
|
ce2a2ec8ed
|
Move engine blocks to PluginEnergy.blocks
|
2015-11-19 01:04:38 -08:00 |
|
mezz
|
10e5391f48
|
Move factory blocks to PluginFactory.blocks
|
2015-11-19 01:04:38 -08:00 |
|
mezz
|
ffe19807db
|
Move mail blocks to PluginMail.blocks
|
2015-11-19 01:04:37 -08:00 |
|
mezz
|
6cfae1462f
|
Move farm blocks to PluginFarming.blocks
|
2015-11-19 01:04:37 -08:00 |
|
mezz
|
18a0ae3643
|
Move apiculture blocks to PluginApiculture.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
|
23fd664e34
|
remove last bits of ForestryItem
|
2015-11-19 01:04:36 -08:00 |
|
mezz
|
60d5728ccb
|
Move core items to PluginCore.items (first...
|
2015-11-19 01:04:35 -08:00 |
|
mezz
|
55118e399f
|
Move butterfly items to PluginLepidopterology.items
|
2015-11-19 01:04:35 -08:00 |
|
mezz
|
7e50c57ba9
|
Move mail items to PluginMail.items
|
2015-11-19 01:04:35 -08:00 |
|
mezz
|
317dd0dbf9
|
Move storage items to PluginStorage.items
|
2015-11-19 01:04:34 -08:00 |
|
mezz
|
e9af62e772
|
Move liquid container items to PluginFluids.items
|
2015-11-19 01:04:34 -08:00 |
|
mezz
|
daa5e3bc75
|
Move food items into PluginFood.items
|
2015-11-19 01:04:33 -08:00 |
|
mezz
|
e248f40f58
|
Move mod compatibility plugins into plugins/compat folder
|
2015-11-19 01:04:33 -08:00 |
|
mezz
|
0e53fccfdb
|
Move food items into PluginFood.items
|
2015-11-19 01:04:33 -08:00 |
|
mezz
|
fc289c16d4
|
Move arboriculture items into PluginApiculture.items
|
2015-11-19 01:04:32 -08:00 |
|
mezz
|
fe69452464
|
Move apiculture items to PluginApiculture.items
|
2015-11-19 01:04:32 -08:00 |
|
mezz
|
4c41d0bb6e
|
Update minimum required Forge version to 10.13.4.1448
|
2015-11-19 01:04:31 -08:00 |
|