Commit graph

  • 166f9a924f Fixed Output of extractor (#679) al132 2016-07-17 20:06:47 -0500
  • 1fb668cad4 Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4 al132 2016-07-17 17:44:27 -0500
  • 84b5de3417 Oops al132 2016-07-17 17:38:10 -0500
  • 9e2c23d04a Fix Extractor insertion and extraction al132 2016-07-17 17:36:40 -0500
  • 48cbda6453 Add CraftTweaker support for the Compressor (#677) al132 2016-07-17 15:31:56 -0500
  • ea74721945 Add CraftTweaker support for the Compressor al132 2016-07-17 15:19:31 -0500
  • 42ee2b7d57 Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4 al132 2016-07-17 14:57:48 -0500
  • fbc0d32407 Fix rare crash with the power net modmuss50 2016-07-16 23:44:42 +0100
  • adf9b8c0e4 Fix #676 modmuss50 2016-07-16 22:16:22 +0100
  • 43bdf25ab3 Version 1.3.3 Modmuss50 2016-07-16 18:11:06 +0100
  • 0fc5d74ad0 Merge pull request #674 from Dragon2488/1.9.4 Gigabit101 2016-07-16 16:57:27 +0100
  • 25c581e129 Recipe fixes. Dragon2488 2016-07-16 22:17:44 +0700
  • 33df1d3319 Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. (#673) Dragon2488 2016-07-16 16:44:54 +0700
  • c1d645fd35 Merge remote-tracking branch 'refs/remotes/TechReborn/1.9.4' into 1.9.4 al132 2016-07-16 02:39:40 -0500
  • ddb96d58ec Merge pull request #672 from Dragon2488/1.9.4 Prospector 2016-07-15 04:05:16 -0700
  • 1f197c3728 Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions. Dragon2488 2016-07-15 17:28:41 +0700
  • 31d1afa044 Merge pull request #671 from Dragon2488/1.9.4 Prospector 2016-07-14 22:39:43 -0700
  • 2b148f3d68 Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid. Dragon2488 2016-07-15 12:15:09 +0700
  • 82ad270713 Merge pull request #670 from al132/1.9.4 Prospector 2016-07-14 16:53:47 -0700
  • 01516c93a3 Fix CraftTweaker compatibility al132 2016-07-14 17:15:36 -0500
  • 2296e6fc18 Merge pull request #668 from karmishin/1.9.4 Gigabit101 2016-07-11 20:54:15 +0100
  • a42ad99ea1 Update ru_RU.lang karmishin 2016-07-09 23:12:09 +0300
  • 91a1c7d4c3 Dusts translated karmishin 2016-07-09 22:48:41 +0300
  • 37fa8f9729 Merge pull request #2 from Sigens/patch-2 karmishin 2016-07-09 17:31:30 +0400
  • 45b66bf30e Ingots and Nuggets karmishin 2016-07-09 16:31:04 +0300
  • 1bbd5ec67e Update ru_RU.lang Sigens 2016-07-09 16:25:17 +0300
  • 998eeb509e Merge pull request #1 from Sigens/patch-1 karmishin 2016-07-09 16:55:35 +0400
  • 1302775237 Update ru_RU.lang Sigens 2016-07-09 15:54:51 +0300
  • 2e0f43ac42 Update ru_RU.lang karmishin 2016-07-09 14:47:16 +0300
  • 92169fa2da Update ru_RU.lang karmishin 2016-07-09 13:57:34 +0300
  • 97236ab7e6 Update ru_RU.lang karmishin 2016-07-08 22:39:18 +0300
  • f239a10bb9 Created russian localization file karmishin 2016-07-08 21:58:30 +0300
  • 6b89ff13ca Update zh_CN.lang (#666) TehporP 2016-07-07 16:53:05 +0800
  • 9fac7ca1ab Updated .lang file (#663) TehporP 2016-07-06 19:45:26 +0800
  • 4fcefc84f3 1.10.2 modmuss50 2016-07-03 13:24:59 +0100
  • 7719633599 Added compatibility for 1.10 modmuss50 2016-06-25 15:25:04 +0100
  • fa9e941217 Update JEI modmuss50 2016-06-08 21:06:41 +0100
  • 315c0aa509 Revert "Revert a shit load of stuff" modmuss50 2016-07-01 15:55:37 +0100
  • d25bb23e8e Revert a shit load of stuff modmuss50 2016-07-01 15:40:46 +0100
  • 1acacd811b Version bump modmuss50 2016-06-07 10:26:07 +0100
  • be336ec249 Fix ChargeHud modmuss50 2016-06-06 20:22:56 +0100
  • 2c6cc4b298 Clean up ic2 recipes a little modmuss50 2016-06-06 19:59:10 +0100
  • 7d0943ea5b Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 modmuss50 2016-06-06 19:55:04 +0100
  • 9c0f0fa111 Started work on the recipe links modmuss50 2016-06-06 19:52:46 +0100
  • 973f68496c Merge branch '1.9.4' into 1.9.4-ic2 modmuss50 2016-06-06 19:02:19 +0100
  • df7cd4da1a Update README.md Prospector 2016-06-05 16:22:18 -0700
  • daff9b8fa6 Add tesla jar modmuss50 2016-06-05 22:47:38 +0100
  • 039aab3e41 Added grinder recipes for gems -> dust (#628) onVoid 2016-06-05 14:05:44 -0700
  • 42faf2357c Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 Prospector 2016-06-05 12:42:32 -0700
  • 20e0c1482e added compressor test Prospector 2016-06-05 12:42:19 -0700
  • 55e6f70900 Fix last PR modmuss50 2016-06-05 20:41:54 +0100
  • d5e83cacb6 Merge pull request #626 from onVoid/patch-1 Modmuss50 2016-06-05 20:38:44 +0100
  • d84bffce46 Fix nanosaber modmuss50 2016-06-05 20:37:22 +0100
  • 83e116f4b5 Added grinder recipes for ingot -> dust onVoid 2016-06-05 12:36:39 -0700
  • 895319ed67 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 modmuss50 2016-06-05 19:43:28 +0100
  • 4d29af274e Balance power recipes modmuss50 2016-06-05 11:23:20 +0100
  • d651b73778 Merge pull request #624 from onVoid/1.9.4 Prospector 2016-06-05 10:52:07 -0700
  • 223732e4ef Textures for andesiteDust, graniteDust, and dioriteDust onVoid 2016-06-05 10:50:30 -0700
  • 0a90c8595b Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 Prospector 2016-06-05 10:41:22 -0700
  • b7e6e109aa Nanosaber still don't work Prospector 2016-06-05 10:41:00 -0700
  • 5bf5c4fff3 Energy Armor Textures Yulife 2016-06-05 14:12:02 +0200
  • 4c01fa8864 Started work on fixing nanosaber Prospector 2016-06-05 03:57:38 -0700
  • bd00b44ab0 Balance power recipes modmuss50 2016-06-05 11:23:20 +0100
  • a719a1c563 Holy huge commit with unhelpful name batman! Prospector 2016-06-05 01:33:40 -0700
  • 90ca45dce9 Broken work modmuss50 2016-06-04 20:20:04 +0100
  • 87f6ea1eb0 Ic2 recipes? modmuss50 2016-06-04 20:07:34 +0100
  • 0bbc088524 No longer shows the RF bar on our machines modmuss50 2016-06-04 18:20:37 +0100
  • eaae9a380d Add ic2 to dev env, and attempt to fix a world gen crash modmuss50 2016-06-04 18:04:30 +0100
  • d80280b110 Fix random world gen crash - Fix electric furnace and version bump modmuss50 2016-06-04 17:03:22 +0100
  • 207d42d81b The One Probe support modmuss50 2016-06-04 14:53:16 +0100
  • 246113dfca Fix generator being overpowered modmuss50 2016-06-04 14:28:36 +0100
  • ae2e063440 Update TileBatBox.java Modmuss50 2016-06-04 14:22:48 +0100
  • 77eddc31b2 More lang for tool tips, closes #610 modmuss50 2016-06-04 11:40:52 +0100
  • 3c62840806 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 modmuss50 2016-06-04 11:32:01 +0100
  • c968cd3b2e Update forge Update mappings Update Tinkers support - Closes #614 modmuss50 2016-06-04 11:31:53 +0100
  • f174749f26 Merge remote-tracking branch 'origin/1.9.4' into 1.9.4 Yulife 2016-06-04 12:30:23 +0200
  • 01ed5c22ab Big JSON cleanup Yulife 2016-06-04 12:27:08 +0200
  • 1a0fb02516 Added config to disable gem tools and armour, closes #617 modmuss50 2016-06-04 11:20:06 +0100
  • d3bd2bf70b Add a safety check to close #619 modmuss50 2016-06-04 11:14:34 +0100
  • 8a8fd59cc1 Add a way to rename and move the blockstates json file modmuss50 2016-06-04 11:02:35 +0100
  • 7951e9913e Armour textures Prospector 2016-06-03 13:05:08 -0700
  • 42d271c018 Recommit 85d9a7ce317affe2067cd6d9c5c7a6a0fbda91a9 modmuss50 2016-06-04 09:56:48 +0100
  • d8b425abc5 Industrial Grinder Yulife 2016-06-02 22:09:14 +0200
  • b09e60f774 Electrolyzer Yulife 2016-06-02 21:31:58 +0200
  • e34a5bb4b5 Blast Furnace Yulife 2016-06-02 20:53:34 +0200
  • 1380724d10 Industrial Sawmill Yulife 2016-06-02 19:21:23 +0200
  • fff952cb1a Fix pipe types modmuss50 2016-06-01 12:30:20 +0100
  • b59794f423 Do not build using the old MCMP modmuss50 2016-06-01 12:07:54 +0100
  • 7f377b042d Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 modmuss50 2016-06-01 12:07:01 +0100
  • 96235d2c9d Uses Reborncores version of MCMP modmuss50 2016-06-01 12:06:51 +0100
  • 9cbebe6dbd Shoo IC2 Exp, Shoo Yulife 2016-05-30 16:11:40 +0200
  • 8b09c72255 s Yulife 2016-05-30 14:18:43 +0200
  • 9f0298b9d5 Nugget Removal Yulife 2016-05-30 14:04:17 +0200
  • 341e862e37 Bunch of new item textures, move Lazurite to plates Yulife 2016-05-30 13:35:20 +0200
  • d051286f95 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 Prospector 2016-05-28 12:40:27 -0700
  • 216e801bec Closes #401 Prospector 2016-05-28 12:40:11 -0700
  • 73d771dd72 Bump version modmuss50 2016-05-28 19:39:29 +0100
  • 1fd58d8986 Improve matter fab modmuss50 2016-05-28 19:33:17 +0100
  • 2923220d85 Fix tool textures Prospector 2016-05-28 09:37:02 -0700
  • 90c32f9cff Backpack Yulife 2016-05-28 18:20:00 +0200