therealfarfetchd
|
8feb3500a4
|
BuildCraft support (#2158)
|
2018-06-28 21:54:17 +02:00 |
|
Nedelosk
|
4515aa513a
|
Update TileEntityDataFixable log from 'info' to 'debug'
|
2018-06-28 21:48:21 +02:00 |
|
Nedelosk
|
c06057ddd0
|
Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into tile-test
|
2018-06-28 21:43:16 +02:00 |
|
Nedelosk
|
9b4a4c2b1d
|
Fix Tile Entity Registration
|
2018-06-28 18:23:45 +02:00 |
|
temp1011
|
2b3d21b05d
|
prevent effect damage underwater (#2149)
|
2018-06-27 03:06:57 +02:00 |
|
temp1011
|
cb43bbee52
|
fix broken texture in butterfly model #2171 (#2173)
|
2018-06-27 03:06:46 +02:00 |
|
temp1011
|
b92a1a10e9
|
add kill count to butterfly kill command (#2174)
|
2018-06-27 03:06:38 +02:00 |
|
Urey. Xue
|
8a431e56ef
|
Update zh_cn.lang (#2169)
|
2018-06-23 23:01:51 +02:00 |
|
Nedelosk
|
f73b48695e
|
Merge remote-tracking branch 'origin/mc-1.12' into bug-1.12
|
2018-06-22 11:25:19 +02:00 |
|
Nedelosk
|
0454fea0a8
|
Fix broken Flower Cache synchronisation to the client and disk
|
2018-06-22 11:25:03 +02:00 |
|
temp1011
|
4ff772954e
|
fix a bug in hasFlowersCache (#2168)
|
2018-06-19 19:48:32 +02:00 |
|
temp1011
|
d8304d5d7e
|
fix log not formatting correctly #2023 (#2164)
|
2018-06-19 19:48:24 +02:00 |
|
Nedelosk
|
a12cfff9d9
|
Clean Up Analyzer Provider
|
2018-06-16 17:50:56 +02:00 |
|
Nedelosk
|
d34ad60d31
|
Fix #2159 Minecart Apiary Gui Crash
|
2018-06-16 17:46:27 +02:00 |
|
Nedelosk
|
508b26ca45
|
Update ForestryPacket.java
|
2018-06-15 10:30:37 +02:00 |
|
Nedelosk
|
255bd9da99
|
Fix #2157 Crash on attempt to break Dehumidifier while camouflaged as block from Chisel
|
2018-06-14 20:09:35 +02:00 |
|
Nedelosk
|
5cedc2adca
|
Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into dev
|
2018-06-14 19:36:39 +02:00 |
|
Nedelosk
|
c968278d27
|
Fix #2160 Remove @SideOnly(Side.CLIENT) from IAlyzerPlugin
|
2018-06-14 19:36:20 +02:00 |
|
src_resources
|
2392785daa
|
Better zh_cn.lang translation file update. (#2146)
Better zh_cn.lang translation file update.
|
2018-06-14 18:10:57 +02:00 |
|
temp1011
|
e82691165f
|
Add config for global biome blacklisting for trees and bees (#2150)
|
2018-06-14 18:09:54 +02:00 |
|
temp1011
|
e54cd57162
|
clean up some config comments (#2153)
|
2018-06-14 18:07:42 +02:00 |
|
temp1011
|
0a3a933b77
|
Cleanup (#2138)
|
2018-06-14 18:07:31 +02:00 |
|
Nedelosk
|
10dbed1406
|
Merge pull request #2151 from rosebeats/mc-1.12
fixed the localization names for the StorageJeiPlugin
|
2018-06-14 18:05:48 +02:00 |
|
Nedelosk
|
b515870cb4
|
Merge remote-tracking branch 'origin/mc-1.12' into dev
|
2018-06-14 18:02:36 +02:00 |
|
Nedelosk
|
30010d2554
|
Improve and Clean Up Gui Elements
|
2018-06-14 18:01:27 +02:00 |
|
rosebeats
|
317d9abfda
|
fixed the localization names for the StorageJeiPlugin
|
2018-06-07 21:14:09 -04:00 |
|
Nedelosk
|
7df3a94916
|
Merge pull request #2142 from temp1011/plugin-compat
fix ic2 crash with apiculture #2139
|
2018-05-28 22:58:09 +02:00 |
|
temp1011
|
8158562974
|
fix ic2 crash with apiculture #2139
|
2018-05-28 14:28:55 +01:00 |
|
temp1011
|
a96ce6c873
|
use new maven for teslaAPI (#2133)
|
2018-05-28 14:06:39 +02:00 |
|
temp1011
|
6efbdd747d
|
Improve Industrialcraft2 plugin (#2057)
|
2018-05-28 14:05:32 +02:00 |
|
Jason Carrete
|
82dd0e5eed
|
Update frames.json (#2137)
|
2018-05-27 11:57:29 +02:00 |
|
Nedelosk
|
64c0590bef
|
Fix Manual Multi-Farms placing humus
|
2018-05-17 15:28:49 +02:00 |
|
Nedelosk
|
691ccd578e
|
Fix #1525 Balance Electric Engine Circuits
|
2018-05-11 12:27:58 +02:00 |
|
Nedelosk
|
98cd99aa4e
|
Fix #1914 Forestry Not Playing Right with Fast Leaf Rendering Options.
|
2018-05-11 12:17:12 +02:00 |
|
Nedelosk
|
cd8e78f60a
|
Merge remote-tracking branch 'origin/mc-1.12' into dev
|
2018-05-11 11:37:21 +02:00 |
|
Nedelosk
|
5ed536da7c
|
Fix #2021 Multifarm configurable without board bug
|
2018-05-11 11:19:07 +02:00 |
|
temp1011
|
96ca20c784
|
Add configuration for crates (#2047)
|
2018-05-11 11:04:11 +02:00 |
|
Dmitriy Medvedev
|
764d969bb4
|
Fixed Backpacks Localization (#2120)
|
2018-05-11 11:02:55 +02:00 |
|
temp1011
|
a26a86fe99
|
use mod log rather than fml log (#2129)
|
2018-05-11 11:02:43 +02:00 |
|
Nedelosk
|
ebe6580aaf
|
Fix #2130 Can't insert Immersive engineering industrial hemp into crop multifarm block
|
2018-05-11 11:01:02 +02:00 |
|
Nedelosk
|
e90ab8caf6
|
Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into dev
|
2018-05-04 15:04:20 +02:00 |
|
Nedelosk
|
efdffd31c8
|
Fix #2113 Conduits / Itemducts not working with alveary
|
2018-05-04 15:04:07 +02:00 |
|
mezz
|
fa515f0941
|
Fix #2114 Limit crafting operations to 64 crafts per shift-click
|
2018-05-02 21:57:28 -07:00 |
|
temp1011
|
78c033a7d2
|
Clean up code (#2053)
|
2018-05-01 19:48:06 +02:00 |
|
temp1011
|
4975fa80c3
|
Make tree gen be configurable (#2046)
|
2018-05-01 18:42:46 +02:00 |
|
temp1011
|
aa642a3ee8
|
small fix for a JEI log error (#2110)
|
2018-05-01 18:42:24 +02:00 |
|
Nedelosk
|
b19809bd3c
|
Merge branch 'mc-1.12' of https://github.com/ForestryMC/ForestryMC into dev
|
2018-05-01 18:42:01 +02:00 |
|
temp1011
|
b566a1befd
|
small fix comb recipes (#2112)
|
2018-05-01 18:41:49 +02:00 |
|
Nedelosk
|
88c9270316
|
Fix #2082 Unable to put fuel into the fermenter
|
2018-05-01 18:41:32 +02:00 |
|
Nedelosk
|
f52cc3893b
|
Add lang file back
|
2018-04-29 12:27:25 +02:00 |
|