Commit graph

540 commits

Author SHA1 Message Date
modmuss50
caaa5a3e7f Fix sounds 2016-05-08 11:42:59 +01:00
modmuss50
9c6e9aef64 Update to new forge registry system 2016-05-08 10:13:21 +01:00
modmuss50
140b03960e Fixes #557 2016-05-08 09:24:16 +01:00
modmuss50
a060c33e5a Fixes #522 2016-05-07 13:45:33 +01:00
modmuss50
4095a0b52d Auto update mappings 2016-05-06 22:13:24 +01:00
Prospector
44f2588b4e Update JEI compat 2016-04-30 20:01:10 -07:00
Prospector
994d12a850 Remove lots of useless stuff (will break existing worlds) 2016-04-29 21:21:28 -07:00
Prospector
d1ca1eaa74 Remove some crap 2016-04-24 10:57:44 -07:00
Prospector
c3f79d6c6f Update Forge 2016-04-23 13:11:30 -07:00
modmuss50
b822cee9fb Update walia, add MT and CT support back, Fix #519, update for new RC bucket thing 2016-04-13 13:47:02 +01:00
modmuss50
ef133ab25b Start on tile rewrite 2016-04-11 17:23:57 +01:00
gigabit101
169c8e5ceb Fixed copper and tin ore ore dict issues 2016-04-10 22:50:05 +01:00
gigabit101
316375ee3a Fixed copper not being oredict 2016-04-10 14:35:28 +01:00
modmuss50
510f969c94 Auto remove un needed things in the code 2016-04-03 14:34:39 +01:00
modmuss50
df61729d6f Some work on the new api 2016-04-03 14:07:45 +01:00
modmuss50
be2a3f4006 Fixes #469 2016-04-01 20:13:50 +01:00
modmuss50
a9d814e777 Fixes #480 2016-04-01 20:10:32 +01:00
gigabit101
7369288829 nothing to see here 2016-04-01 17:16:34 +01:00
gigabit101
45174e40ec closes #477 2016-04-01 13:06:49 +01:00
Prospector
77104b39ce Recipe changes and DOGECOIN 2016-03-29 22:45:15 -07:00
Prospector
4af72aed00 Fix Transformer Upgrade Recipe 2016-03-29 17:43:35 -07:00
Prospector
42c0ad2bfc fix more recipes 2016-03-29 03:01:23 -07:00
Stuart Pomeroy
5216082445 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-29 10:31:08 +01:00
Stuart Pomeroy
af7a0e4fd3 Remove test item. 2016-03-29 10:30:55 +01:00
Prospector
b06c454634 Upgrade recipes 2016-03-29 02:17:48 -07:00
Modmuss50
1fa014c098 I may have broken a lot of recipes, can someone check? But it should fix #474 2016-03-29 09:36:00 +01:00
Prospector
58902f3901 Quite a bit of fixes/additions 2016-03-29 00:30:05 -07:00
Prospector
cec54aa0c8 Fix lots of issues 2016-03-28 19:47:00 -07:00
gigabit101
ae30dc7685 Added some plate recipes 2016-03-28 21:52:51 +01:00
gigabit101
5b40c9e88e Removed dupe recipes 2016-03-28 21:37:55 +01:00
gigabit101
c1860d6326 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-03-28 21:33:41 +01:00
gigabit101
1cfa5e79e7 more Recipes 2016-03-28 21:33:36 +01:00
Prospector
2297eef08d Fix scrapbox loot and add another glass fibre cable recipe 2016-03-28 12:54:17 -07:00
Modmuss50
fe916ae6b2 Merge branch '1.9' of https://github.com/MrBretze/TechReborn into MrBretze-1.9
# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
2016-03-28 19:32:06 +01:00
gigabit101
8fe61a9c54 Recipes for all gem tools and armor 2016-03-28 18:31:32 +01:00
gigabit101
1136574bc2 Chainsaw recipes 2016-03-28 18:13:52 +01:00
Stuart Pomeroy
427963b40a Closes #434, Add tooltips to grinder and batbox. Fix centrifuge. closes #436 2016-03-28 17:50:25 +01:00
MrBretzel
581b3c8358 The dev is the end 2016-03-28 16:46:29 +02:00
MrBretzel
b503feed8a Force adding ItemStack to Scrapbox List 2016-03-28 16:45:22 +02:00
MrBretzel
a1335f118a New system for recycler registry, juste wool and clay not work, i d'ont why this not work :/ 2016-03-28 16:29:26 +02:00
Stuart Pomeroy
e91a1c2ff1 Closes #433 and fixes a bug i found with #434 2016-03-28 13:57:43 +01:00
Stuart Pomeroy
69507da776 Fix some of #434, waiting on @gigabit101 2016-03-28 13:42:06 +01:00
Stuart Pomeroy
6054610c3c Fixes lava cells, closes #419 2016-03-28 12:54:41 +01:00
Prospector
d0f27cb941 Add more scrapbox loot (and dev heads to the loot! woo) 2016-03-28 02:24:15 -07:00
Prospector
28fd887ee3 Ruby, sapphire, and peridot armour 2016-03-27 22:48:31 -07:00
Prospector
a636da1882 Bronze Tools and Armour 2016-03-27 21:20:27 -07:00
Stuart Pomeroy
78e8acce7b Fixed some GUIS and some Mass Fabs 2016-03-27 20:10:49 +01:00
modmuss50
5eed5b161d Code formatter take 2 2016-03-25 09:47:34 +00:00
modmuss50
33985f1a31 Revert "Added code formatter"
This reverts commit b9448d5d90.
2016-03-24 00:41:47 +00:00
modmuss50
b9448d5d90 Added code formatter 2016-03-24 00:39:26 +00:00
modmuss50
a1078a4951 Added WIP tool tip 2016-03-23 18:59:39 +00:00
gigabit101
1d9fe100b1 Recipes and debug texture 2016-03-23 18:45:58 +00:00
gigabit101
a999d5064a another recipe 2016-03-23 18:19:42 +00:00
gigabit101
5c7035c389 Added a but ton of recipes 2016-03-23 18:17:37 +00:00
modmuss50
ab19d71ede Moved shields to RebornCore 2016-03-22 20:30:59 +00:00
modmuss50
4f3d9ddfca Shields 2016-03-21 19:36:54 +00:00
modmuss50
5fde39ebcd Some improvements to things 2016-03-20 21:23:12 +00:00
modmuss50
b31806d004 Added more recipe things 2016-03-20 17:23:36 +00:00
modmuss50
d66c2e8301 Added debug items 2016-03-20 16:43:25 +00:00
gigabit101
f3016ed07d Some recipes 2016-03-20 15:28:40 +00:00
gigabit101
d9666edb4f few little grinder recipes 2016-03-20 01:05:53 +00:00
gigabit101
2fa00b9c7f little fixs 2016-03-19 23:18:31 +00:00
modmuss50
e319398bc9 Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-16 17:09:34 +00:00
modmuss50
51539f4ec8 Remove item transformers 2016-03-16 17:04:19 +00:00
modmuss50
5a0f8be435 Added transformers 2016-03-16 16:54:44 +00:00
modmuss50
8c24711d4f Optimise imports 2016-03-15 08:13:05 +00:00
modmuss50
e0547cecff Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9 2016-03-15 08:07:06 +00:00
TheDoctorSoda
e90592403b Added Scrapboxinator, reverted yellow energy outlines, added grinder textures 2016-03-14 21:53:05 -07:00
modmuss50
b7c71edf4f Added MFE and MFSU blocks and tiles, gui and textures to come later 2016-03-14 08:34:15 +00:00
modmuss50
5480a5c3e5 Added batBox, gui to come later 2016-03-14 08:26:41 +00:00
modmuss50
ec67e9650d Fixed building? 2016-03-14 07:56:36 +00:00
modmuss50
849f68bc94 Trying to fix git part 1 2016-03-14 07:55:54 +00:00
TheDoctorSoda
801b497d86 Update some texture paths, fix ore harvestibility, and fix ore recipes 2016-03-13 22:25:06 -07:00
TheDoctorSoda
7d5fe7f19a Changed lots of texture paths. There will be some missing ones, I'll resolve those later. 2016-03-13 20:27:15 -07:00
modmuss50
7a121be651 Some small fixes 2016-03-13 16:57:10 +00:00
modmuss50
7f920b282f Optimise imports to make it easier to find and replace package names 2016-03-13 15:37:55 +00:00
modmuss50
05ee9f30f4 Nuke. 2016-03-13 11:50:46 +00:00
modmuss50
82043cadc4 Move config files into own dir 2016-03-11 13:09:59 +00:00
TheDoctorSoda
2221a303ad Move thermal generator TE to proper package 2016-03-07 21:56:37 -08:00
gigabit101
626cbbbbc7 derp 2016-03-07 17:26:04 +00:00
gigabit101
080b633493 Finish up on recycler and temp jei handler 2016-03-07 14:07:52 +00:00
gigabit101
007f9266e5 Recycler output is now a random chance 2016-03-07 12:45:54 +00:00
TheDoctorSoda
f170f9a418 Fix Scrapbox JEI handler localisation 2016-03-06 23:56:15 -08:00
TheDoctorSoda
1a1ec6fee8 [TEXTURES] Energy storage upgrade and wrench update & more scrapbox loot 2016-03-06 23:47:17 -08:00
TheDoctorSoda
38af4881b4 Started nanosaber, needs work but wanted to get the item in. 2016-03-06 23:01:02 -08:00
TheDoctorSoda
ca3cd6d4f8 Scrapbox JEI handler and modified some scrapbox recipes
This is my first JEI handler, kinda just stole it from the compressor. hope I did good?
2016-03-06 22:23:25 -08:00
gigabit101
77e2edc005 More work on recycler 2016-03-07 00:21:22 +00:00
gigabit101
02ac62a180 Started Recycler 2016-03-06 23:15:28 +00:00
gigabit101
059b197d5c More recipe tweaks 2016-03-06 21:00:42 +00:00
gigabit101
d02424070d Recipe tweak 2016-03-06 20:22:43 +00:00
gigabit101
90f5d77a41 Finish on Iron furnace
Added Jei support to Iron Furnace
2016-03-06 19:59:39 +00:00
gigabit101
961e821402 Start on Iron furnace 2016-03-06 15:58:34 +00:00
gigabit101
9161133585 battery recipe 2016-03-06 15:09:05 +00:00
modmuss50
7a5c7df9c2 Standalone Cable items 2016-03-06 14:51:13 +00:00
gigabit101
188cee7b3b Added Cable recipes 2016-03-06 14:46:30 +00:00
gigabit101
066d329388 test recipe 2016-03-06 14:26:08 +00:00
gigabit101
56caa00e46 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-06 13:48:52 +00:00
gigabit101
398309ab0c Added refined Iron Recipe 2016-03-06 13:48:48 +00:00
modmuss50
7de133eb5c Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-06 13:37:54 +00:00
modmuss50
8b5a2dc87a Fixes recipe crashing 2016-03-06 13:37:46 +00:00
gigabit101
fcb8cc0a8e Compressor Jei Support 2016-03-06 13:33:35 +00:00
gigabit101
391b28e50f Added Extractor JEI support thanks @mezz for making this so easy :) 2016-03-06 13:20:38 +00:00
gigabit101
087c97780f Added reinforced Glass 2016-03-05 23:31:46 +00:00
gigabit101
0f505c8b6b More Recipes 2016-03-05 23:31:32 +00:00
gigabit101
bbfa430e96 Added recipe to wrench 2016-03-05 23:04:40 +00:00
gigabit101
382c38ed10 added a few more recipes 2016-03-05 22:50:51 +00:00
gigabit101
3302d63385 Added lapatron and energy crystals 2016-03-05 22:50:39 +00:00
gigabit101
5400dff4d3 some recipes 2016-03-05 22:27:38 +00:00
gigabit101
cda9b4ff81 spent a hour trying to figure out why I was crashing 2016-03-05 20:37:04 +00:00
gigabit101
694aae55ff some recipe things 2016-03-05 19:42:22 +00:00
TheDoctorSoda
3c3591cec2 Treetap recipe and [TEXTURES] uu matter change 2016-03-02 17:16:35 -08:00
modmuss50
5e82463330 Initial port of cables from kotlin 2016-03-02 16:29:51 +00:00
modmuss50
06d23b10b7 Remove overcomplicated powernet 2016-03-02 15:42:45 +00:00
TheDoctorSoda
9e5f223a42 Added jackhammers 2016-02-28 11:18:59 -08:00
TheDoctorSoda
74caaf6bd6 Made chainsaws share code 2016-02-27 16:49:50 -08:00
modmuss50
e4b8918224 More work on the cables, and add items 2016-02-27 19:36:01 +00:00
modmuss50
4b5d05a063 Started work on the new PowerNetwork 2016-02-27 19:02:28 +00:00
modmuss50
7ef16b475b Idea broke the imports, here is the fix 2016-02-26 21:51:34 +00:00
modmuss50
e8539eadd3 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-26 21:47:16 +00:00
modmuss50
9507c92d94 Added wrench 2016-02-26 21:46:55 +00:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
gigabit101
80df0b6d2c fixed recipe derp 2016-02-26 12:57:15 +00:00
TheDoctorSoda
4efb322ccd Fix drill tier and charge configs and add chainsaws 2016-02-25 17:42:24 -08:00
modmuss50
2fbccc696f Removed Iron Fence gate, it was bugged and is not in GT. 2016-02-25 20:24:26 +00:00
modmuss50
b907e62a45 Some new recipes 2016-02-25 20:21:57 +00:00
modmuss50
ef62b8909c Remove debug recipes 2016-02-25 20:13:39 +00:00
modmuss50
d0392dabb8 Added wind and water mill 2016-02-25 20:03:58 +00:00
modmuss50
efbf4c59bb Added a load of new parts 2016-02-25 18:37:29 +00:00
modmuss50
9a1136fe25 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-25 18:28:20 +00:00
modmuss50
a8cf7fbb87 Added lava and water cells 2016-02-25 18:28:13 +00:00
gigabit101
9ce8d58062 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-25 18:26:07 +00:00
gigabit101
82d2de7eb1 Start on the new manual 2016-02-25 18:25:52 +00:00
modmuss50
ed3d3c78b5 Added solar panel 2016-02-25 18:21:59 +00:00
gigabit101
7d6c982847 Fixed a bad recipe 2016-02-25 14:31:18 +00:00
gigabit101
3274894625 Added hammer and some basic plate recipes 2016-02-25 14:16:08 +00:00
gigabit101
1dbb03cf75 Added some grinder recipes
Added copper and tin blocks closes #351
2016-02-25 13:59:22 +00:00
gigabit101
46cd99cdf5 Copper and Tin ore 2016-02-25 13:35:12 +00:00
modmuss50
46cdf8f587 Fixes to configs, optimise imports. 2016-02-24 08:18:21 +00:00
TheDoctorSoda
45047be17b Added loot and rubber tree configs 2016-02-23 21:26:57 -08:00
TheDoctorSoda
d7474fec45 Added copper and tin to dungeon loot 2016-02-23 21:07:18 -08:00
TheDoctorSoda
9dacfe3c7b Add rubber saplings as chest loot. 2016-02-23 20:24:50 -08:00
modmuss50
56b1619ca6 Register some more replacement blocks/items 2016-02-23 08:38:32 +00:00
TheDoctorSoda
90932acab9 Add iron fence and fence gate
Cannot for the life of my figure out why the iron fence gate block won't render correctly. The blockstate isn't being called. Hopefully I can figure out in the morning
2016-02-22 00:11:19 -08:00
TheDoctorSoda
bb7e68eb59 Fix machine sides/add rubber plank texture 2016-02-21 15:08:44 -08:00
gigabit101
b613b1e419 Drills 2016-02-20 23:04:32 +00:00
gigabit101
0522e9539f Added some textures
Added Tree Tap
Added Tree Tap logic
2016-02-20 22:50:24 +00:00
modmuss50
0cf477dd89 Some small changes and fixes. 2016-02-20 21:01:14 +00:00
modmuss50
1f59226e01 Add some stuff, that does things 2016-02-20 19:46:18 +00:00
modmuss50
0ac86ff303 Added sapling 2016-02-20 18:40:35 +00:00
modmuss50
71c2bfee7f Moved power system to RC and spawn trees in groups 2016-02-20 16:59:31 +00:00