temp1011
bcafbcbc32
resolve conflict
2018-03-14 18:53:30 +00:00
temp1011
19a30bdb91
Stop peat fired engine outputting ash through power side
2018-03-01 15:52:00 +00:00
Nedelosk
e9019fd8c3
Fix #1997 Actually Additions Integration
2018-02-18 09:58:55 +01:00
Nedelosk
d43cc63367
Close #1859 , Close #1858 Add Natura huge glowshrooms farm support
2018-02-17 15:54:49 +01:00
Nedelosk
89e8ec8e38
Update Lang
2018-02-17 14:27:23 +01:00
Nedelosk
f270231e67
Fix "X-Ray" Leaves and wrong leaf particle color
2018-02-17 14:25:11 +01:00
Nedelosk
34be92d462
Fix #1959 Forestry leaves causing server crash
2018-02-16 18:56:25 +01:00
Nedelosk
eea193aa83
Fix #1962 Wood Pile fire spread might be a bit too aggressive
2018-02-16 18:51:33 +01:00
Nedelosk
d6a5827f0b
Fix #1974 Add Support for Animania wool types in recipes
2018-02-16 18:46:13 +01:00
Nedelosk
a093e7c094
Fix #1982 Wrong drop Greenhouse Window
2018-02-16 18:34:17 +01:00
Nedelosk
4ea0795063
Fix #1975 Farm blocks change type on world reload
2018-02-16 18:01:31 +01:00
Nedelosk
31b83ea852
Fix #1963 Forestry leaves confuse minimap mods
2018-02-16 17:55:40 +01:00
Nedelosk
0f494d4ac7
Merge remote-tracking branch 'origin/mc-1.12' into mc-1.12
2018-02-16 17:12:27 +01:00
Nedelosk
0cfddef397
Fix #1984 Server crash when placing an arboretum
2018-02-16 17:12:10 +01:00
Nedelosk
e4478bc296
Merge pull request #1968 from temp1011/more-blacklisting
...
Add whitelist for generation based on dimension
2018-02-16 17:09:45 +01:00
Nedelosk
6a921c78fb
Merge pull request #1986 from temp1011/modules-disable
...
Fix a disabled module crash
2018-02-16 17:09:28 +01:00
Nedelosk
5f9e0f30fd
Merge remote-tracking branch 'origin/mc-1.12' into mc-1.12
2018-02-16 17:08:04 +01:00
Nedelosk
355ba9a7ed
Fix #1993 , Fix #1972 Managed Succulent Farm doesn't work and Farm multiblock causing chunks to be loaded
2018-02-16 17:07:40 +01:00
Nedelosk
424bc8910d
Fix #1988 Arborist's Chests causing suffocation damage
2018-02-16 16:50:39 +01:00
Nedelosk
6eab284cd1
Fix #1989 "X-Ray" Leaves
2018-02-16 16:37:17 +01:00
temp1011
1745a7e946
More correct method
2018-02-11 11:52:59 +00:00
temp1011
74e381f184
formatting
2018-02-11 11:24:07 +00:00
temp1011
0b2589b007
Fix crash if HarvestCraft present but Apiculture disabled
2018-02-11 11:22:35 +00:00
Nedelosk
d29187746d
Merge pull request #1980 from temp1011/gear-fix
...
Oredict for bronze gear in sorting pipe recipe
2018-02-10 13:11:35 +01:00
temp1011
26d538cb50
Add oredict for bronze gear in sorting pipe recipe
2018-02-08 11:19:34 +00:00
Nedelosk
d48fca4652
Fix #1969 Multiblock farms server-crash
2018-02-03 23:17:38 +01:00
temp1011
211ab566a7
Fix return statement
2018-02-03 18:32:24 +00:00
temp1011
bb7a42dff5
Woops
2018-02-03 18:21:31 +00:00
temp1011
31bcc661cd
Added whitelist for dimension generation too
2018-02-03 18:13:53 +00:00
temp1011
43a29e7ec8
Merge branch 'mc-1.12' of https://github.com/temp1011/ForestryMC into mc-1.12
2018-02-03 11:57:09 +00:00
temp1011
13905ee4a9
merge ( #1 )
...
* Reintroduce the old-style farm
* Remove Unused Files
* Fix #1945 Database duping trees / bees
* Fix broken model baker uvs
* Improve Farm Logic System and add ring farm layout
* Rebalance electron tubes and add ender farm
* Improve fertilizer config and Clean Up
* Clean Up API
* Add missing farm logic localisation
* Add missing fluid handler capability to the planter
* Remove unneeded GL state changes
* Update Lang
* Fix #1955 Add Filter Sorting to fix a server sided bug
* Make cultivation farms more expensive
* Round fertilizer values
* Add deprecated circuit replacement and Version 5.8
2018-02-03 11:55:03 +00:00
Nedelosk
2b9b105211
Add deprecated circuit replacement and Version 5.8
v5.8.0
2018-02-03 12:45:27 +01:00
Nedelosk
8b10349309
Merge pull request #1948 from ForestryMC/farm
...
Reintroduce the old-style farm and Rebalance electron tubes
2018-02-03 12:10:48 +01:00
Nedelosk
0d26b6b2f2
Merge pull request #1965 from temp1011/mc-1.12
...
Add IMC messages for dimension blacklist
2018-02-03 12:08:05 +01:00
temp1011
3e5de52efd
fix imports
2018-02-02 00:18:41 +00:00
temp1011
e30e9f4ab9
Add IMC messages for mods to blacklist dimensions in
2018-02-02 00:07:59 +00:00
Nedelosk
05d1eb87ce
Round fertilizer values
2018-01-28 22:54:35 +01:00
Nedelosk
7679dfc393
Make cultivation farms more expensive
2018-01-28 18:38:29 +01:00
Nedelosk
bb52acc67c
Fix #1955 Add Filter Sorting to fix a server sided bug
2018-01-23 16:24:56 +01:00
Nedelosk
3caf8cbfef
Update Lang
2018-01-23 15:36:38 +01:00
Nedelosk
207f15ed0b
Remove unneeded GL state changes
2018-01-23 15:29:30 +01:00
Nedelosk
c5178be225
Add missing fluid handler capability to the planter
2018-01-22 19:54:14 +01:00
Nedelosk
cd7250604e
Add missing farm logic localisation
2018-01-22 18:56:25 +01:00
Nedelosk
533c9d0b2a
Clean Up API
2018-01-20 21:29:07 +01:00
Nedelosk
c00fa15f0e
Improve fertilizer config and Clean Up
2018-01-20 21:00:21 +01:00
Nedelosk
ce3dea42e3
Pull from branch 'mc-1.12'
2018-01-20 19:28:34 +01:00
Nedelosk
287cb8cb87
Rebalance electron tubes and add ender farm
2018-01-20 18:05:31 +01:00
Nedelosk
10fec50457
Improve Farm Logic System and add ring farm layout
2018-01-20 02:35:33 +01:00
Nedelosk
43c61c18c0
Fix broken model baker uvs
2018-01-15 19:23:54 +01:00
Nedelosk
dca593f7d8
Fix #1945 Database duping trees / bees
2018-01-15 19:18:59 +01:00