Commit graph

2223 commits

Author SHA1 Message Date
modmuss50
df651e7016 Some improvements to the designer 2016-04-07 15:57:20 +01:00
modmuss50
9e107c849f Initial work on the new in game wiki 2016-04-05 20:09:07 +01:00
modmuss50
4f01850616 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-04-04 23:06:58 +01:00
modmuss50
3c5e2b335a Fixes #497 2016-04-04 23:06:49 +01:00
Prospector
3b94b09194 Add Transformer configs
Closes #501
2016-04-03 15:20:35 -07:00
Modmuss50
1c3edcb571 Update build.gradle 2016-04-03 23:16:49 +01:00
modmuss50
8246f73e20 bump forge and deps 2016-04-03 19:25:52 +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
b44cdd4064 Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9 2016-04-03 14:07:55 +01:00
modmuss50
df61729d6f Some work on the new api 2016-04-03 14:07:45 +01:00
Prospector
8b7067732a New circuit textures 2016-04-03 00:35:46 -07:00
Modmuss50
5cc9c8af59 Update README.md 2016-04-02 23:27:11 +01:00
modmuss50
3d819967be Fixes #444 2016-04-01 20:22:55 +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
modmuss50
a37693b8da Fixes #479 2016-04-01 20:08:40 +01:00
modmuss50
58b5472987 Fixes #482 2016-04-01 20:06:33 +01:00
modmuss50
477a60e8de fixes #490 2016-04-01 19:40:08 +01:00
modmuss50
04f0736568 Fixes #465 2016-04-01 19:35:27 +01:00
gigabit101
7369288829 nothing to see here 2016-04-01 17:16:34 +01:00
gigabit101
d61032cb07 closes #488 2016-04-01 13:11:06 +01:00
gigabit101
45174e40ec closes #477 2016-04-01 13:06:49 +01:00
gigabit101
b035e87bc9 closes #491 2016-04-01 13:02:58 +01:00
Modmuss50
15df117677 Version 1.0.4 2016-03-31 14:33:54 +01:00
Prospector
77104b39ce Recipe changes and DOGECOIN 2016-03-29 22:45:15 -07:00
Prospector
88fbcb1aaf Fix lightning rod texture 2016-03-29 19:01:21 -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
42c0ad2bfc fix more recipes 2016-03-29 03:01:23 -07:00
Stuart Pomeroy
f9ea484159 Fix non fuels going in the fuel slot. 2016-03-29 10:45:43 +01: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
Stuart Pomeroy
4c2877d0d5 Rewrite Transformers, closes #441 2016-03-29 10:29:51 +01:00
Prospector
b06c454634 Upgrade recipes 2016-03-29 02:17:48 -07:00
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