Commit graph

416 commits

Author SHA1 Message Date
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
modmuss50
891d2cce32 Added rubber processing 2016-02-20 10:58:58 +00:00
gigabit101
defde302fe Added machine block recipe last commit for night 2016-02-20 03:57:15 +00:00
gigabit101
ee2841b5b1 Added machine blocks 2016-02-20 03:47:35 +00:00
gigabit101
f947ef37a4 Added basic battery and fixed issues with Lithium Battery 2016-02-20 03:35:20 +00:00
gigabit101
047625389d Added compressor, extractor, electric furnace 2016-02-20 03:07:56 +00:00
gigabit101
cd13932bde Basic generator just needs logic 2016-02-20 02:21:44 +00:00
modmuss50
cfab240ac7 Added some more items 2016-02-20 01:32:08 +00:00
gigabit101
464d8cac03 Added advancedCircuit and Circuit 2016-02-20 01:08:18 +00:00
gigabit101
aa41d576e3 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-20 00:58:02 +00:00
gigabit101
8ad4a45716 Added basic Grinder 2016-02-20 00:57:57 +00:00
modmuss50
a76384504f Rubber Trees 2016-02-20 00:55:18 +00:00
modmuss50
9268fa4d55 1117 lines of new recipes?
Added a new recipe manager to allow us to list the missing items that need to be reimplemented.
2016-02-19 20:32:26 +00:00
modmuss50
9a585bcfb2 Merge branch '1.7.10' into 1.8.9
Conflicts:
	build.gradle
	src/main/java/techreborn/blocks/BlockOre.java
	src/main/java/techreborn/items/ItemCells.java
2016-02-16 13:49:25 +00:00
modmuss50
25777b3f96 Fixes #217 2016-02-16 10:00:03 +00:00
modmuss50
bf691fd8a6 Fixes #313 2016-02-16 09:07:22 +00:00
modmuss50
b3bec47b11 Fixes #313 2016-02-06 11:51:55 +00:00
modmuss50
8ec95f9119 Now using new Forge Dynamic buckets, and prep for new update 2016-02-02 21:05:42 +00:00
modmuss50
3909a868aa Revert "Revert "Fix bucket issues""
This reverts commit d5b880387a.

# Conflicts:
#	src/main/java/techreborn/items/tools/ItemFluidbucket.java
2016-01-22 17:41:47 +00:00
modmuss50
d5b880387a Revert "Fix bucket issues"
This reverts commit 43768b9310.
2016-01-16 17:50:18 +00:00
modmuss50
43768b9310 Fix bucket issues 2016-01-16 15:54:41 +00:00
modmuss50
b242ec5c5f Cut all the things! 2016-01-02 01:40:11 +00:00
modmuss50
cf800a905b Fixes #309 and might help #314 2016-01-01 20:35:58 +00:00
Modmuss50
0fdba82490 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
#	src/main/java/techreborn/compat/CompatManager.java
2015-12-16 17:10:25 +00:00
Modmuss50
0c80f2beda More recipes, work on #182 2015-12-16 16:40:47 +00:00