modmuss50
|
caaa5a3e7f
|
Fix sounds
|
2016-05-08 11:42:59 +01:00 |
|
Prospector
|
2a367085e1
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-05-07 13:34:00 -07:00 |
|
Prospector
|
2b84fceef3
|
Remove vinteum dust
|
2016-05-07 13:33:14 -07: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
|
ab1a2910dd
|
Get rid of scrapbox code in freq. transmitter :P
|
2016-04-25 07:00:31 -07:00 |
|
modmuss50
|
b55c0a3c8e
|
Revert ItemParts.java, fix issue with ManualLoader
|
2016-04-24 21:07:56 +01:00 |
|
Prospector
|
d1ca1eaa74
|
Remove some crap
|
2016-04-24 10:57:44 -07:00 |
|
modmuss50
|
a2d626bc61
|
Fixes #523
|
2016-04-23 13:32:03 +01:00 |
|
modmuss50
|
ef133ab25b
|
Start on tile rewrite
|
2016-04-11 17:23:57 +01:00 |
|
modmuss50
|
510f969c94
|
Auto remove un needed things in the code
|
2016-04-03 14:34:39 +01:00 |
|
modmuss50
|
7e7fcf2ad9
|
Made the api usefull
|
2016-04-03 14:25:46 +01:00 |
|
modmuss50
|
df61729d6f
|
Some work on the new api
|
2016-04-03 14:07:45 +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 |
|
Stuart Pomeroy
|
02357ce1a4
|
Fix Tiles and Guis, closes #478 and closes #479
|
2016-03-29 20:27:23 +01:00 |
|
Modmuss50
|
918f1a0ed5
|
Merge remote-tracking branch 'origin/1.9' into 1.9
|
2016-03-29 11:19:49 +01:00 |
|
Modmuss50
|
57220526c0
|
Update for new json destroyer
|
2016-03-29 11:19:24 +01:00 |
|
Prospector
|
b06c454634
|
Upgrade recipes
|
2016-03-29 02:17:48 -07: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 |
|
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
|
1cfa5e79e7
|
more Recipes
|
2016-03-28 21:33:36 +01:00 |
|
gigabit101
|
5f4ae53c85
|
Added WIP to some Items
|
2016-03-28 18:38:09 +01:00 |
|
Stuart Pomeroy
|
d51a772979
|
Fix Wrenching, closes #418
|
2016-03-28 13:35:59 +01:00 |
|
Prospector
|
3df24a1831
|
Add tools/armour to creative tab
|
2016-03-28 01:26:54 -07:00 |
|
Prospector
|
a636da1882
|
Bronze Tools and Armour
|
2016-03-27 21:20:27 -07:00 |
|
Stuart Pomeroy
|
dfb7d0afd4
|
Fix Merges
|
2016-03-27 20:14:13 +01:00 |
|
Stuart Pomeroy
|
78e8acce7b
|
Fixed some GUIS and some Mass Fabs
|
2016-03-27 20:10:49 +01:00 |
|
gigabit101
|
33c8386324
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 19:40:22 +01:00 |
|
gigabit101
|
d0289037dc
|
Added WIP tag to book
|
2016-03-27 19:40:10 +01:00 |
|
modmuss50
|
aeb567deb7
|
Fixes #416
|
2016-03-27 18:38:43 +01:00 |
|
Stuart Pomeroy
|
8fba82312c
|
Closes #402,#404,406
|
2016-03-27 17:41:56 +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 |
|
gigabit101
|
bd37e8ad7f
|
3D Wrench
|
2016-03-23 17:05:21 +00:00 |
|
modmuss50
|
fffcecbb98
|
Revert "Removed bucket textures as it now generates them at runtime"
This reverts commit 4585684fe2 .
|
2016-03-23 11:37:30 +00:00 |
|
modmuss50
|
d66c2e8301
|
Added debug items
|
2016-03-20 16:43:25 +00:00 |
|
gigabit101
|
24c806d68a
|
Some texture fix's
|
2016-03-20 15:39:25 +00:00 |
|
gigabit101
|
f3016ed07d
|
Some recipes
|
2016-03-20 15:28:40 +00:00 |
|