modmuss50
|
315c0aa509
|
Revert "Revert a shit load of stuff"
This reverts commit d25bb23e8e .
|
2016-07-01 15:55:37 +01:00 |
|
modmuss50
|
d25bb23e8e
|
Revert a shit load of stuff
|
2016-07-01 15:40:46 +01:00 |
|
modmuss50
|
7d0943ea5b
|
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2016-06-06 19:55:04 +01:00 |
|
modmuss50
|
9c0f0fa111
|
Started work on the recipe links
|
2016-06-06 19:52:46 +01:00 |
|
modmuss50
|
973f68496c
|
Merge branch '1.9.4' into 1.9.4-ic2
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
|
2016-06-06 19:02:19 +01:00 |
|
onVoid
|
039aab3e41
|
Added grinder recipes for gems -> dust (#628)
|
2016-06-05 22:05:44 +01:00 |
|
modmuss50
|
55e6f70900
|
Fix last PR
|
2016-06-05 20:41:54 +01:00 |
|
Modmuss50
|
d5e83cacb6
|
Merge pull request #626 from onVoid/patch-1
Added grinder recipes for ingot -> dust
|
2016-06-05 20:38:44 +01:00 |
|
modmuss50
|
d84bffce46
|
Fix nanosaber
|
2016-06-05 20:37:22 +01:00 |
|
onVoid
|
83e116f4b5
|
Added grinder recipes for ingot -> dust
|
2016-06-05 12:36:39 -07:00 |
|
modmuss50
|
4d29af274e
|
Balance power recipes
|
2016-06-05 19:43:17 +01:00 |
|
modmuss50
|
bd00b44ab0
|
Balance power recipes
|
2016-06-05 11:23:20 +01:00 |
|
modmuss50
|
90ca45dce9
|
Broken work
|
2016-06-04 20:20:04 +01:00 |
|
modmuss50
|
87f6ea1eb0
|
Ic2 recipes?
|
2016-06-04 20:07:34 +01:00 |
|
modmuss50
|
1a0fb02516
|
Added config to disable gem tools and armour, closes #617
|
2016-06-04 11:20:06 +01:00 |
|
modmuss50
|
8a8fd59cc1
|
Add a way to rename and move the blockstates json file
|
2016-06-04 11:02:35 +01:00 |
|
Yulife
|
9cbebe6dbd
|
Shoo IC2 Exp, Shoo
|
2016-05-30 16:11:40 +02:00 |
|
Yulife
|
341e862e37
|
Bunch of new item textures, move Lazurite to plates
... and relocation of some assets
|
2016-05-30 13:37:27 +02:00 |
|
Prospector
|
216e801bec
|
Closes #401
|
2016-05-28 12:40:11 -07:00 |
|
modmuss50
|
f39a047f49
|
Fixes #481 and Fixes empty cell texture
|
2016-05-25 17:23:19 +01:00 |
|
modmuss50
|
e01e4be209
|
Added the code to show all unused items in recycler recipes
|
2016-05-25 17:06:12 +01:00 |
|
modmuss50
|
135e3e3be2
|
Fixes #483
|
2016-05-25 16:57:50 +01:00 |
|
modmuss50
|
e532a0b276
|
Fixes #568
|
2016-05-25 16:53:27 +01:00 |
|
modmuss50
|
1ab33a9473
|
Use new file server, add more checks to recipes
|
2016-05-25 11:07:42 +01:00 |
|
modmuss50
|
25ee0b5790
|
Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture
|
2016-05-23 18:26:21 +01:00 |
|
Prospector
|
188e2ef0c5
|
Fix tool tiers
|
2016-05-23 00:13:11 -07:00 |
|
Prospector
|
d452cf0fe6
|
Fix
|
2016-05-22 14:13:38 -07:00 |
|
Prospector
|
be36455415
|
Rename to tungstenGrindingHead
|
2016-05-22 14:01:38 -07:00 |
|
modmuss50
|
a24ee95c4d
|
Fix crash when reloading texture
|
2016-05-22 21:20:39 +01:00 |
|
Yulife
|
54106e082d
|
Relocation of assets, TINY DUSTS
|
2016-05-22 17:19:05 +02:00 |
|
Yulife
|
ab74f1c077
|
Remove Red Rock, implement new vanilla stones
|
2016-05-22 16:53:15 +02:00 |
|
modmuss50
|
161eb87246
|
Remove voidstone, does NOT break worlds
|
2016-05-22 14:53:56 +01:00 |
|
modmuss50
|
8fb186c39f
|
Merge remote-tracking branch 'remotes/origin/1.9' into 1.9.4
|
2016-05-18 20:20:33 +01:00 |
|
modmuss50
|
3509ff4f10
|
Clean up Ore Dic Registry, should fix INV Tweaks crash
|
2016-05-18 20:14:50 +01:00 |
|
modmuss50
|
74d500a2fd
|
Update to minecraft version 1.9.4
|
2016-05-18 16:53:54 +01:00 |
|
modmuss50
|
7d95dea783
|
Update Item Registry
|
2016-05-17 21:39:07 +01:00 |
|
modmuss50
|
e38c800f21
|
Added Universal Cell
|
2016-05-17 21:12:33 +01:00 |
|
modmuss50
|
9035f2a21c
|
Merge branch '1.9' into 1.9-BTM
|
2016-05-17 19:55:57 +01:00 |
|
modmuss50
|
90c7ab09ec
|
Fixes #587
|
2016-05-17 18:41:09 +01:00 |
|
modmuss50
|
7e2db4a715
|
Rewrote fluids
Now uses json files
Now uses forge bucket
Now not broken, closes #557
|
2016-05-17 18:36:51 +01:00 |
|
modmuss50
|
aaeb67f9c4
|
Fixes #583
|
2016-05-17 10:28:06 +01:00 |
|
modmuss50
|
4a1226322e
|
Merge branch '1.9' into 1.9-BTM
|
2016-05-16 16:21:33 +01:00 |
|
modmuss50
|
89d9dc99e2
|
Fixes #381 rubber ore dic issue
|
2016-05-16 16:04:31 +01:00 |
|
Prospector
|
3cf950d491
|
Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes.
|
2016-05-15 21:24:35 -07:00 |
|
modmuss50
|
a2063df069
|
added basic block
|
2016-05-14 18:53:07 +01:00 |
|
modmuss50
|
fd95cf7141
|
Some more work on fluid pipe rendering, I may recode it
|
2016-05-09 16:33:36 +01:00 |
|
modmuss50
|
dd6e69bea5
|
Start work on fluid pipes
|
2016-05-09 11:13:52 +01:00 |
|
modmuss50
|
45e31c1aef
|
Added pump
|
2016-05-08 21:42:09 +01:00 |
|
modmuss50
|
58371903d3
|
Fix major gig derp
|
2016-05-08 21:11:17 +01:00 |
|
Prospector
|
a6cfd90339
|
get tinkers in the dev env (no compat yet)
|
2016-05-08 10:26:40 -07:00 |
|
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 |
|