Commit Graph
119 Commits
Author SHA1 Message Date
bdew df961f03f2 Merge remote-tracking branch 'remotes/origin/mc1710' into forestry_unstable 2015-08-16 20:22:44 +03:00
bdew 240bfab175 Added charging recipe using normal crafting and redstone dust/blocks for people that don't have charging blocks. 2015-08-11 15:29:47 +03:00
bdew 98ea3db702 Force US locale on all upper/lower case conversions + normalized icon registration across all mods (#124) 2015-08-09 15:59:47 +03:00
bdew 6154317ccc Merged changes from main branch
Update hive spawn example
  Added "Near" hive spawn condition
  Made hive debugger check if hive replaces air or a block
  Added hive debugger
  Update!
2015-07-30 17:42:43 +03:00
bdew 24e031b364 Added hive debugger 2015-07-30 16:14:55 +03:00
PatchouliHina b29a59c560 Update! 2015-07-28 18:58:18 +08:00
bdew b714f96e13 Merged changes from main branch
Moved hive block registration to happen at the same time as hive description
  Don't crash if hive block is missing description for whatever reason
  more work on drops for custom hives
  Implemented drops for hive spawning system
  Require forestry 3.6.0 when loading
2015-07-28 12:30:50 +03:00
bdew 9e48c0d12a Moved hive block registration to happen at the same time as hive description 2015-07-28 12:20:33 +03:00
bdew a563fc8971 Fixed multiple bugs in apiaries 2015-07-26 03:19:26 +03:00
bdew ae8e23d041 Reworked error triggers, fixed crash 2015-07-26 03:05:30 +03:00
bdew 2fc3454003 All machines will keep their stuff when broken, requires bdlib 1.9.0 2015-06-24 16:03:12 +03:00
bdew 8487dafe84 Winter and Ocean upgrades should increase energy use by 20% (to be in line with other biome upgrdes) 2015-06-18 17:47:59 +03:00
bdew 84f72d0e8d Added ocean emulation upgrade - closes #99 2015-06-18 14:59:44 +03:00
bdew e2f2cd0c75 Added config option to disable mutations in the mutatron or force them to check requirements (closes #100) 2015-06-18 14:48:01 +03:00
bdew 1983641650 Added derpious bees - pattern reward for Evans B 2015-05-23 12:51:15 +03:00
Yves 3bc57e1d70 Create fr_FR.lang 2015-05-12 17:11:41 +02:00
Anton 107dcbb917 Update ru_RU.lang 2015-04-30 17:01:53 +03:00
DragonsLover 3761e05404 Updating French Canadian language
Fixing some typos
2015-03-30 01:49:14 -04:00
DragonsLover 4d38e81fb2 Adding French Canadian language 2015-03-30 01:44:33 -04:00
bdew 8c0b0a29fa Added silktouch mode to scoop and fixed #83 2015-03-18 15:53:59 +02:00
Puyo061 637f105c2d Update ko_KR.lang 2015-03-08 09:00:13 +09:00
bdew 41b3faa34a Rewrote waila handler to use getNBTData instead of depricated registerSyncedNBTKey, improved apiary tooltip 2015-02-18 13:06:51 +02:00
bdew 293aed775b Added missing disabled icon 2015-02-08 16:28:19 +02:00
bdew 5bcf0d1bf0 Added pollen collection kit 2015-02-08 16:28:18 +02:00
bdew 6a79af662f Updated to Forestry 337 (ErrorStateRegistry changes), made disabled a custom error state 2014-12-17 12:38:23 +02:00
bdew a7d2d99c24 Build against BC 6.2.0 and Forestry 3.2.0, nuked MJ code 2014-11-28 19:02:10 +02:00
bdew 5278bc2752 Updated assembly recipes registration to work with 6.1 2014-11-02 12:42:31 +02:00
bdew 59932187bb Added HaveForestryModule config conditional - to check for disabled modules in forestry 2014-10-21 10:51:07 +03:00
bdew cdfed59a7a Configuration system update, see http://bdew.net/gendustry/configuration/ 2014-10-06 14:06:57 +03:00
[MMKP]Puyo061 e11ac0c8a6 Update ko_KR.lang 2014-09-28 19:25:32 +09:00
Saku d45bd5779e Update zh_CN.lang 2014-09-24 23:48:14 +08:00
bdew 12378eef12 Added winter upgrade (closes #52) 2014-09-24 16:07:05 +03:00
bdew 69f5d9bb87 Added mutation biome and block requirements option (closes #51) 2014-09-24 16:06:48 +03:00
[MMKP]Puyo061 15e2817705 Update ko_KR.lang 2014-09-19 00:07:43 +09:00
bdew f141c88180 Added yellorium ingots as mutagen source (closes #47) 2014-09-18 17:53:01 +03:00
MMKP Team Public 6e43bebc33 Create ko_KR.lang (squished from #48) 2014-09-06 14:40:51 +03:00
Princess 146878834f Update 1.7.10 2014-08-25 23:34:58 +08:00
Anton 3a8dabe7c2 Update ru_RU.lang 2014-08-24 17:49:35 +04:00
bdew 49107f4a01 Merge branch 'patch-1' of https://github.com/Vexatos/gendustry into mc1710 2014-08-24 14:42:15 +03:00
bdew 2275136c15 Changed bee species translation keys to better match forestry system (#41) 2014-08-24 14:35:02 +03:00
Vexatos e2ca6585a7 Update de_DE.lang 2014-08-24 12:55:38 +02:00
bdew 2961ef83cc Killed ExtraBees serum conversion, it's FUBAR in EB2 anyway and i'm not sure i even want to rewrite it 2014-08-24 11:42:54 +03:00
bdew 2511c6172f Improved compatibility with Botany, flowers are safe to use in all machines now 2014-08-24 11:37:58 +03:00
bdew d7cc3cbd4c Added creative tabs, moved stuff around 2014-08-12 12:43:10 +03:00
wodkashorty a71e90688d Updated de_DE.lang, thanks wodkashorty (closes #38) 2014-08-10 10:12:21 +03:00
Anton 8b91189385 Create ru_RU.lang 2014-07-31 15:37:48 +04:00
bdew a62aca9cbf Merge remote-tracking branch 'remotes/origin/mc172' into mc1710 2014-07-14 12:55:21 +03:00
bdew a1ef44b9fc Fixed cover recipes 2014-07-14 12:54:50 +03:00
bdew 8c34ff6f85 Changes for 1.7.10 2014-07-14 11:59:09 +03:00
bdew ccae98e6f8 Fixed and cleaned up merged code 2014-06-23 13:59:23 +03:00