Commit graph

1637 commits

Author SHA1 Message Date
modmuss50
a921751618 Fixed recipe issues, again 2016-03-06 14:28:45 +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
e71a43f038 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-06 13:33:45 +00:00
gigabit101
fcb8cc0a8e Compressor Jei Support 2016-03-06 13:33:35 +00:00
modmuss50
6462569b73 Temp fix for #371 2016-03-06 13:30:31 +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
e96fe4bea7 grinder now returns grinder 2016-03-05 23:31:22 +00:00
gigabit101
bbfa430e96 Added recipe to wrench 2016-03-05 23:04:40 +00:00
gigabit101
a9ad808dcb Added missing localization 2016-03-05 23:00:12 +00:00
gigabit101
f1cbfc471b set wrench stack size to 1 2016-03-05 22:56:52 +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
modmuss50
71062a55bd Fusion reactor now kills the player, coils to come soon 2016-03-05 19:09:07 +00:00
modmuss50
1e24d1f116 Texture Rendering for cables 2016-03-05 18:10:36 +00:00
TheDoctorSoda
4000dbcc55 get rid of ugly lines 2016-03-05 10:07:51 -08:00
TheDoctorSoda
41b4e1027e insulated copper cable texture 2016-03-05 09:07:48 -08:00
TheDoctorSoda
657a12a3b3 Copper cable texture 2016-03-05 08:53:36 -08:00
modmuss50
a94039a5c2 More cable work 2016-03-05 14:24:31 +00:00
modmuss50
7d514b718a Fixes #369 and fixes rubber tree spikes not decaying 2016-03-05 11:37:29 +00:00
modmuss50
0204ddc539 Cables render, need textures 2016-03-05 11:19:33 +00:00
modmuss50
e3c150c06e Inital cable rendering
This only took 2 hours :/
2016-03-05 10:48:13 +00:00
modmuss50
0b04bb8c69 Some more work on rendering 2016-03-04 19:47:08 +00:00
TheDoctorSoda
3c3591cec2 Treetap recipe and [TEXTURES] uu matter change 2016-03-02 17:16:35 -08:00
modmuss50
b9daec57f8 Update README.md 2016-03-02 16:54:40 +00:00
modmuss50
df9c159435 Ported the rendering code 2016-03-02 16:45:49 +00:00
modmuss50
5ed5aeea54 Revert "Gradle 2.11"
This reverts commit c8453292b4.
2016-03-02 16:35:03 +00:00
modmuss50
1d72578973 Remove commented out code 2016-03-02 16:33:59 +00:00
modmuss50
5e82463330 Initial port of cables from kotlin 2016-03-02 16:29:51 +00:00
modmuss50
721ba370bb Remove old partsystem, time for a new one 2016-03-02 15:43:39 +00:00
modmuss50
06d23b10b7 Remove overcomplicated powernet 2016-03-02 15:42:45 +00:00
modmuss50
e448bd1317 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-03-02 13:53:08 +00:00
modmuss50
7d37157c08 Fixes #303 2016-03-02 13:52:17 +00:00
gigabit101
c5dabec844 Note for @modmuss50 2016-03-01 16:33:33 +00:00
gigabit101
65266317b3 Cable types 2016-03-01 16:32:06 +00:00
gigabit101
2e10f10197 closes #368 2016-03-01 16:13:53 +00:00
modmuss50
80d5e00706 Power net work 2016-02-29 17:30:46 +00:00
modmuss50
6de20dcba1 Fix crash with temp thaumcraft integration 2016-02-29 13:30:14 +00:00
modmuss50
e680f3fb1f Updates, and re added support 2016-02-29 11:20:40 +00:00
TheDoctorSoda
158f68c4a8 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 2016-02-29 00:20:28 -08:00
TheDoctorSoda
c5cfa0890d [TEXTURES] Massive storage block, plate, and ingot overhaul 2016-02-29 00:19:49 -08:00
modmuss50
b0cb4f87c5 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-02-29 08:15:23 +00:00