Commit graph

2374 commits

Author SHA1 Message Date
Prospector
4c01fa8864 Started work on fixing nanosaber 2016-06-05 03:57:38 -07:00
modmuss50
bd00b44ab0 Balance power recipes 2016-06-05 11:23:20 +01:00
Prospector
a719a1c563 Holy huge commit with unhelpful name batman!
-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
2016-06-05 01:33:40 -07: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
0bbc088524 No longer shows the RF bar on our machines 2016-06-04 18:20:37 +01:00
modmuss50
eaae9a380d Add ic2 to dev env, and attempt to fix a world gen crash 2016-06-04 18:04:30 +01:00
modmuss50
d80280b110 Fix random world gen crash - Fix electric furnace and version bump 2016-06-04 17:03:22 +01:00
modmuss50
207d42d81b The One Probe support 2016-06-04 14:53:16 +01:00
modmuss50
246113dfca Fix generator being overpowered 2016-06-04 14:28:36 +01:00
Modmuss50
ae2e063440 Update TileBatBox.java 2016-06-04 14:22:48 +01:00
modmuss50
77eddc31b2 More lang for tool tips, closes #610 2016-06-04 11:40:52 +01:00
modmuss50
3c62840806 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-04 11:32:01 +01:00
modmuss50
c968cd3b2e Update forge
Update mappings
Update Tinkers support - Closes #614
2016-06-04 11:31:53 +01:00
Yulife
f174749f26 Merge remote-tracking branch 'origin/1.9.4' into 1.9.4
# Conflicts:

#	run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json
2016-06-04 12:30:23 +02:00
Yulife
01ed5c22ab Big JSON cleanup 2016-06-04 12:27:08 +02:00
modmuss50
1a0fb02516 Added config to disable gem tools and armour, closes #617 2016-06-04 11:20:06 +01:00
modmuss50
d3bd2bf70b Add a safety check to close #619 2016-06-04 11:14:34 +01:00
modmuss50
8a8fd59cc1 Add a way to rename and move the blockstates json file 2016-06-04 11:02:35 +01:00
Prospector
7951e9913e Armour textures 2016-06-04 09:59:20 +01:00
modmuss50
42d271c018 Recommit 85d9a7ce317affe2067cd6d9c5c7a6a0fbda91a9 2016-06-04 09:56:48 +01:00
Yulife
d8b425abc5 Industrial Grinder 2016-06-02 22:09:14 +02:00
Yulife
b09e60f774 Electrolyzer 2016-06-02 21:31:58 +02:00
Yulife
e34a5bb4b5 Blast Furnace 2016-06-02 20:53:34 +02:00
Yulife
1380724d10 Industrial Sawmill 2016-06-02 19:21:53 +02:00
modmuss50
fff952cb1a Fix pipe types 2016-06-01 12:30:20 +01:00
modmuss50
b59794f423 Do not build using the old MCMP 2016-06-01 12:07:54 +01:00
modmuss50
7f377b042d Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-06-01 12:07:01 +01:00
modmuss50
96235d2c9d Uses Reborncores version of MCMP 2016-06-01 12:06:51 +01:00
Yulife
9cbebe6dbd Shoo IC2 Exp, Shoo 2016-05-30 16:11:40 +02:00
Yulife
8b09c72255 s 2016-05-30 14:18:43 +02:00
Yulife
9f0298b9d5 Nugget Removal 2016-05-30 14:04:17 +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
d051286f95 Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4 2016-05-28 12:40:27 -07:00
Prospector
216e801bec Closes #401 2016-05-28 12:40:11 -07:00
modmuss50
73d771dd72 Bump version 2016-05-28 19:39:29 +01:00
modmuss50
1fd58d8986 Improve matter fab 2016-05-28 19:33:17 +01:00
Prospector
2923220d85 Fix tool textures 2016-05-28 09:37:02 -07:00
Yulife
90c32f9cff Backpack 2016-05-28 18:20:00 +02:00
Yulife
338a7cda0c More tools
@ProfessorProspector
2016-05-28 15:42:22 +02:00
modmuss50
69bdb0034b Fix setting up dev workspace 2016-05-28 13:13:46 +01:00
Modmuss50
cec1cb7446 Update build.gradle 2016-05-28 10:06:54 +01:00
Modmuss50
8cb62c60d6 Update build.gradle 2016-05-27 07:52:37 +01:00
Modmuss50
deabc41653 Update build.gradle 2016-05-27 07:51:21 +01:00
Modmuss50
5815864c25 Update plugin 2016-05-27 07:48:55 +01:00
Modmuss50
4926dccf8d set the latest version of TechReborn to be the current one on mods.io 2016-05-26 19:50:38 +01:00
Modmuss50
40f1ff9be7 Update build.gradle 2016-05-26 19:48:43 +01:00
modmuss50
1b9e47206a Add modsio uploading 2016-05-26 17:31:02 +01:00
modmuss50
f7ff3f87a9 Added command to show missing recipes, closes #485 2016-05-25 17:30:06 +01:00
modmuss50
f39a047f49 Fixes #481 and Fixes empty cell texture 2016-05-25 17:23:19 +01:00