modmuss50
|
3abfc3cb13
|
Ore config now uses HJSon, its easier for humans to read and I have included a converter
|
2016-04-16 08:58:17 +01:00 |
|
modmuss50
|
cdee0ddc06
|
Debof jar now runs the designer, this might change
|
2016-04-15 21:54:43 +01:00 |
|
modmuss50
|
b06d89cf93
|
fixes #522
|
2016-04-14 07:53:29 +01:00 |
|
modmuss50
|
912eced5e5
|
Move assemblingmachine and centrifuge to the new system
|
2016-04-13 16:25:51 +01:00 |
|
modmuss50
|
8c49a27b76
|
allow AmbientOcclusion on cables
|
2016-04-13 16:13:03 +01: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
|
4fccaa1f5f
|
Update AlloySmelter to new system
|
2016-04-12 08:39:50 +01:00 |
|
modmuss50
|
23d55e6251
|
Work on the new container stuff
|
2016-04-12 08:33:38 +01:00 |
|
modmuss50
|
98d459735f
|
Implement IRecipeCrafterProvider on all tiles that need it
|
2016-04-11 17:50:00 +01:00 |
|
modmuss50
|
dded3c685a
|
Massive tile clean up, I might have broken something somewhere
|
2016-04-11 17:43:54 +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
|
d43c4c5d20
|
Fixes #513
|
2016-04-09 16:42:54 +01:00 |
|
modmuss50
|
ed5effb888
|
Even more work on the designer, last commit before I break everying
|
2016-04-09 16:29:48 +01:00 |
|
modmuss50
|
77102819a4
|
A lot of work on the wiki designer
|
2016-04-08 15:19:10 +01:00 |
|
modmuss50
|
bc7b5b2566
|
Fixes #511
|
2016-04-08 14:24:53 +01:00 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
30052aac18
|
Quick fix for #427
|
2016-03-28 19:39:10 +01: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 |
|
Stuart Pomeroy
|
123612acb9
|
Fix Merge
|
2016-03-28 09:38:59 +01:00 |
|
Stuart Pomeroy
|
1993fa92bd
|
Add MFE GUI and made batterys charge and decharge?
|
2016-03-28 09:34:48 +01:00 |
|
Prospector
|
e31cbae97a
|
No longer electrocutes players in creative mode
|
2016-03-28 01:27:34 -07:00 |
|
Prospector
|
3df24a1831
|
Add tools/armour to creative tab
|
2016-03-28 01:26:54 -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 |
|
modmuss50
|
877308a75c
|
Some small tweaks
|
2016-03-27 19:23:38 +01:00 |
|
Stuart Pomeroy
|
dfb7d0afd4
|
Fix Merges
|
2016-03-27 20:14:13 +01:00 |
|