Commit Graph
2562 Commits
Author SHA1 Message Date
temp1011 aa45da81ba Fix extra drop from greenhouse window (#2072) 2018-04-05 21:22:48 +02:00
temp1011 3cd1c30dbc Update Forge and Mappings (#2075) 2018-04-05 21:21:48 +02:00
Nedelosk 8ba478d758 Add Guide Book and Analyzer Screen (#2073) 2018-04-05 21:20:16 +02:00
Nedelosk b5a8740e4a Merge pull request #2016 from temp1011/engine-output
Stop peat fired engine outputting ash through power side
2018-03-30 18:23:19 +02:00
Nedelosk 8f6b056776 Merge pull request #2051 from temp1011/remove-chisel-plugin
Remove Chisel Plugin
2018-03-30 18:22:24 +02:00
Nedelosk d72ba48a1a Merge pull request #2055 from temp1011/butterfly-gamerule
Make butterflies obey mob spawning gamerules
2018-03-30 18:21:50 +02:00
Nedelosk c0a3e2240f Merge pull request #2054 from temp1011/block-xp-drop
Use different method to drop xp from Apatite Ore
2018-03-30 18:21:39 +02:00
temp1011 46f78ce7b3 Make butterflies obey mob spawning gamerules 2018-03-24 02:13:28 +00:00
temp1011 b0bc8429ac Don't drop xp orbs into world directly 2018-03-24 01:52:15 +00:00
temp1011 9c44111665 Remove Chisel Plugin 2018-03-23 22:18:37 +00:00
mezz 54a9da917d Replace Forestry IRC link with discord badge 2018-03-17 23:51:56 -07:00
temp1011 bcafbcbc32 resolve conflict 2018-03-14 18:53:30 +00:00
Nedelosk 2ce018d84b Merge pull request #1998 from asiekierka/mc-1.12
minor ShapedRecipeCustom optimization
2018-03-14 17:06:35 +01:00
Nedelosk 0638822b74 Merge pull request #2006 from temp1011/self-breeding
Add self-pollination of leaves near bees
2018-03-14 17:06:24 +01:00
Nedelosk 2b8d905e0e Merge branch 'mc-1.12' into self-breeding 2018-03-14 17:06:16 +01:00
Nedelosk d0f28a32b2 Merge pull request #2012 from temp1011/repairable-armour
Make Apiarist Armour Repairable
2018-03-14 17:04:20 +01:00
Nedelosk b74e142ce1 Merge pull request #2025 from temp1011/flowerpot-flowers
Add potted plants as flowers for bees
2018-03-14 17:03:47 +01:00
Nedelosk 3d95b9f6d9 Merge pull request #2032 from temp1011/charcoal-block-oredict
Register Charcoal Block with Ore Dictionary
2018-03-14 17:03:00 +01:00
Nedelosk 571d158809 Merge remote-tracking branch 'origin/mc-1.12' into mc-1.12 2018-03-14 17:02:11 +01:00
Nedelosk 9cd6bfcfa8 Merge pull request #2033 from temp1011/fix-jei-errors
Fix JEI errors for disabled modules
2018-03-14 17:01:44 +01:00
Nedelosk ebc70ab22a Fix #2037 Add Comparator Support for Engines 2018-03-14 16:45:38 +01:00
Nedelosk e3e4a4341d Fix #2042 Another crash with butterflies 2018-03-14 15:35:49 +01:00
Nedelosk 918e4f0099 Fix #2040 Villager AI Crashes Server 2018-03-14 15:25:00 +01:00
temp1011 123bed88a2 Add AI for Apiarist to Replace Bees in Village Bee Houses (#2001) 2018-03-12 21:09:09 -07:00
temp1011 9de446cc4e Fix Broken Ore Dictionary Registration 2018-03-11 19:29:39 +00:00
temp1011 f328efa4e9 Fix JEI errors for disabled modules 2018-03-11 17:40:16 +00:00
temp1011 cdb5ddeb6a Register Charcoal Block with Ore Dictionary 2018-03-11 16:56:47 +00:00
temp1011 7f83c387e3 Remove test, use Enum instead of ordinal 2018-03-06 23:54:34 +00:00
temp1011 95c52f3607 Add potted plants as flowers for bees 2018-03-06 15:32:23 +00:00
temp1011 19a30bdb91 Stop peat fired engine outputting ash through power side 2018-03-01 15:52:00 +00:00
temp1011 1b262d6604 Improve logic 2018-02-28 19:33:09 +00:00
temp1011 ca73687940 Make Apiarist Armour Repairable 2018-02-26 22:39:57 +00:00
temp1011 ed2f06c514 formatting, re-include config 2018-02-26 21:44:12 +00:00
temp1011 bef36c15b0 Move self pollination into main pollination method
- Only happens if normal pollination can't occur
- Will not cause return otherwise would worsen chance for cross pollination
2018-02-26 21:39:19 +00:00
temp1011 7dba583c26 Add self-pollination of leaves near bees 2018-02-24 18:04:17 +00:00
Adrian Siekierka 3168639c89 minor ShapedRecipeCustom optimization 2018-02-19 11:59:44 +01: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