Stuart Pomeroy
|
fbfd42427e
|
Fix wrench.
|
2016-03-29 10:01:18 +01:00 |
|
Stuart Pomeroy
|
ad9f50110a
|
Auto stash for revert of "Closes #443, #466, #468"
|
2016-03-29 10:00:23 +01:00 |
|
Stuart Pomeroy
|
4f9f98e1bd
|
Revert "Closes #443, #466, #468"
This reverts commit faa6aa30d0.
|
2016-03-29 09:58:32 +01:00 |
|
Stuart Pomeroy
|
faa6aa30d0
|
Closes #443, #466, #468
|
2016-03-29 09:58:07 +01:00 |
|
Stuart Pomeroy
|
43aca4d3f4
|
Merged branch 1.9 into 1.9
|
2016-03-29 09:43:30 +01:00 |
|
Stuart Pomeroy
|
3282677f02
|
Fix it so the packs charge things.
|
2016-03-29 09:43:07 +01: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 |
|
Prospector
|
620bbfc1df
|
Rework batteries
|
2016-03-28 16:02:39 -07:00 |
|
gigabit101
|
8280703eb4
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-28 21:52:57 +01:00 |
|
gigabit101
|
ae30dc7685
|
Added some plate recipes
|
2016-03-28 21:52:51 +01:00 |
|
Stuart Pomeroy
|
816c92d6b1
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-28 21:43:53 +01:00 |
|
Stuart Pomeroy
|
a8ee636846
|
Work on the LapotronPack - Hitt forge bug.
|
2016-03-28 21:43:32 +01:00 |
|
gigabit101
|
9556ceecf9
|
removed dupe
|
2016-03-28 21:38:30 +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 |
|
Stuart Pomeroy
|
7249130c0c
|
Give the debug tool a name
|
2016-03-28 21:05:08 +01:00 |
|
Stuart Pomeroy
|
12ab5ecc62
|
Give NukePrimed entity a name.
|
2016-03-28 21:03:52 +01:00 |
|
Prospector
|
ad50f58133
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-28 12:54:28 -07:00 |
|
Prospector
|
2297eef08d
|
Fix scrapbox loot and add another glass fibre cable recipe
|
2016-03-28 12:54:17 -07:00 |
|
Stuart Pomeroy
|
2209177e1a
|
Fix config changes etc.
|
2016-03-28 20:51:23 +01:00 |
|
Stuart Pomeroy
|
83190fc39f
|
Config typos and whatever Thanks @AkTheKnight
|
2016-03-28 20:45:49 +01:00 |
|
Modmuss50
|
63f31cf673
|
Merge remote-tracking branch 'origin/1.9' into 1.9
|
2016-03-28 19:39:56 +01:00 |
|
Modmuss50
|
30052aac18
|
Quick fix for #427
|
2016-03-28 19:39:10 +01:00 |
|
Prospector
|
0e4983a0f1
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-28 11:36:34 -07:00 |
|
Prospector
|
112502e09c
|
New machine block textures (thanks @Drullkus)
|
2016-03-28 11:36:18 -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
|
5f4ae53c85
|
Added WIP to some Items
|
2016-03-28 18:38:09 +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 |
|
gigabit101
|
d740f167b6
|
Added WIP tags to a few more Blocks
|
2016-03-28 18:08:24 +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 |
|
Stuart Pomeroy
|
1dfa6c094f
|
Fix Energy Storage not outputting, closes #435
|
2016-03-28 17:01:36 +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
|
d51a772979
|
Fix Wrenching, closes #418
|
2016-03-28 13:35:59 +01:00 |
|
Stuart Pomeroy
|
6054610c3c
|
Fixes lava cells, closes #419
|
2016-03-28 12:54:41 +01:00 |
|
Stuart Pomeroy
|
6ff03bc706
|
Fix block item drops and such. Closes #428
|
2016-03-28 12:23:55 +01:00 |
|
Stuart Pomeroy
|
6247a2093d
|
Merged branch 1.9 into 1.9
|
2016-03-28 11:47:56 +01:00 |
|
Stuart
|
6149511d0b
|
Frickin. what.
|
2016-03-28 11:47:20 +01:00 |
|
Stuart
|
ca33b92cea
|
Dont even know.
|
2016-03-28 11:47:01 +01:00 |
|
Stuart Pomeroy
|
c25ab8227a
|
Update the Tiles for Storage. Also work on Drops. Not Finished.
|
2016-03-28 11:45:21 +01:00 |
|
Stuart Pomeroy
|
696a535bd2
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-28 10:27:16 +01:00 |
|
Prospector
|
d0f27cb941
|
Add more scrapbox loot (and dev heads to the loot! woo)
|
2016-03-28 02:24:15 -07:00 |
|
Stuart Pomeroy
|
fffeb93ff1
|
Fix Solar panels
|
2016-03-28 10:09:26 +01:00 |
|
