Dragon2488
33df1d3319
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. ( #673 )
2016-07-16 10:44:54 +01:00
Prospector
ddb96d58ec
Merge pull request #672 from Dragon2488/1.9.4
...
Properly integration with IC2 through ore dictionary. JEI recipes...
2016-07-15 04:05:16 -07:00
Dragon2488
1f197c3728
Properly integration with IC2 through ore dictionary. JEI recipes energy usage and time descriptions.
2016-07-15 17:28:41 +07:00
Prospector
31d1afa044
Merge pull request #671 from Dragon2488/1.9.4
...
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability…
2016-07-14 22:39:43 -07:00
Dragon2488
2b148f3d68
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid.
2016-07-15 12:15:09 +07:00
al132
01516c93a3
Fix CraftTweaker compatibility
...
A version of CraftTweaker that is compatible with 1.9.4 has been
released since the Minetweaker/CraftTweaker dependency was removed. I
have restored compatibility with the new version of CraftTweaker
2016-07-14 17:15:36 -05:00
modmuss50
7719633599
Added compatibility for 1.10
2016-07-01 15:58:15 +01:00
modmuss50
fa9e941217
Update JEI
2016-07-01 15:55:44 +01:00
modmuss50
315c0aa509
Revert "Revert a shit load of stuff"
...
This reverts commit d25bb23e8e
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e
Revert a shit load of stuff
2016-07-01 15:40:46 +01:00
modmuss50
be336ec249
Fix ChargeHud
2016-06-06 20:22:56 +01:00
modmuss50
2c6cc4b298
Clean up ic2 recipes a little
2016-06-06 19:59:10 +01:00
modmuss50
7d0943ea5b
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:55:04 +01:00
modmuss50
9c0f0fa111
Started work on the recipe links
2016-06-06 19:52:46 +01:00
modmuss50
973f68496c
Merge branch '1.9.4' into 1.9.4-ic2
...
# Conflicts:
# src/main/java/techreborn/init/ModRecipes.java
2016-06-06 19:02:19 +01:00
onVoid
039aab3e41
Added grinder recipes for gems -> dust ( #628 )
2016-06-05 22:05:44 +01:00
modmuss50
55e6f70900
Fix last PR
2016-06-05 20:41:54 +01:00
Modmuss50
d5e83cacb6
Merge pull request #626 from onVoid/patch-1
...
Added grinder recipes for ingot -> dust
2016-06-05 20:38:44 +01:00
modmuss50
d84bffce46
Fix nanosaber
2016-06-05 20:37:22 +01:00
onVoid
83e116f4b5
Added grinder recipes for ingot -> dust
2016-06-05 12:36:39 -07:00
modmuss50
895319ed67
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
2016-06-05 19:43:28 +01:00
modmuss50
4d29af274e
Balance power recipes
2016-06-05 19:43:17 +01:00
Prospector
b7e6e109aa
Nanosaber still don't work
2016-06-05 10:41:00 -07:00
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
c968cd3b2e
Update forge
...
Update mappings
Update Tinkers support - Closes #614
2016-06-04 11:31:53 +01: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
Yulife
b09e60f774
Electrolyzer
2016-06-02 21:31:58 +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
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
1fd58d8986
Improve matter fab
2016-05-28 19:33:17 +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
modmuss50
e01e4be209
Added the code to show all unused items in recycler recipes
2016-05-25 17:06:12 +01:00
modmuss50
135e3e3be2
Fixes #483
2016-05-25 16:57:50 +01:00
modmuss50
e532a0b276
Fixes #568
2016-05-25 16:53:27 +01:00
modmuss50
1ab33a9473
Use new file server, add more checks to recipes
2016-05-25 11:07:42 +01:00
modmuss50
6156591b0e
Disable manual downloading until its useful
2016-05-24 08:09:18 +01:00
modmuss50
25ee0b5790
Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture
2016-05-23 18:26:21 +01:00
modmuss50
401093a70b
Fix player detectors
2016-05-23 17:22:50 +01:00
modmuss50
9fa5e560e1
Fixes #561
2016-05-23 17:09:38 +01:00
modmuss50
78ccf1bcfb
Tweak some power values, closes #564
2016-05-23 17:05:10 +01:00
Prospector
188e2ef0c5
Fix tool tiers
2016-05-23 00:13:11 -07:00
Prospector
d452cf0fe6
Fix
2016-05-22 14:13:38 -07:00
Prospector
be36455415
Rename to tungstenGrindingHead
2016-05-22 14:01:38 -07:00
modmuss50
a19f115925
Fix ConcurrentModificationException when merging two power networks
2016-05-22 21:47:07 +01:00
modmuss50
55c7f68d75
Remove Distributor from creative tab
2016-05-22 21:40:32 +01:00
modmuss50
b1215b62fe
Temp fix for armour
2016-05-22 21:33:50 +01:00
modmuss50
a24ee95c4d
Fix crash when reloading texture
2016-05-22 21:20:39 +01:00
modmuss50
0f1e8eb6d7
Fixes cable issues, closes #596 thanks @xannor for spotting this
2016-05-22 20:48:03 +01:00
Yulife
4050076a81
Clean up, Missing dusts, no more ID shifting
2016-05-22 17:44:15 +02:00
Yulife
54106e082d
Relocation of assets, TINY DUSTS
2016-05-22 17:19:05 +02:00
Yulife
ab74f1c077
Remove Red Rock, implement new vanilla stones
2016-05-22 16:53:15 +02:00
modmuss50
161eb87246
Remove voidstone, does NOT break worlds
2016-05-22 14:53:56 +01:00
modmuss50
ccb5ab7e2f
Remove 1.9 deps
2016-05-22 13:24:44 +01:00
Prospector
8fffe67f17
Update to use new ChatUtils
2016-05-21 21:51:26 -07:00
modmuss50
6f3c8780c5
Disable update checker, use curse
2016-05-21 20:18:30 +01:00
modmuss50
dbaed2721e
Fixes #590 and fixes build
2016-05-21 20:05:13 +01:00
modmuss50
1efa303bad
Fixes #593
2016-05-21 20:01:03 +01:00
modmuss50
128a95c338
jei 1.9.4 and clean tile packets
2016-05-19 09:07:31 +01:00
modmuss50
8fb186c39f
Merge remote-tracking branch 'remotes/origin/1.9' into 1.9.4
2016-05-18 20:20:33 +01:00
modmuss50
3509ff4f10
Clean up Ore Dic Registry, should fix INV Tweaks crash
2016-05-18 20:14:50 +01:00
modmuss50
83e2cd1310
Update forge
2016-05-18 19:19:22 +01:00
modmuss50
caa05a26a0
Beta release
2016-05-18 17:40:52 +01:00
modmuss50
fcae1a54d7
Use 1.9.4, update mc multipart
2016-05-18 17:06:05 +01:00
modmuss50
8f3352238f
Workaround a forge bug, REVERT WHEN FIXED
2016-05-18 17:00:42 +01:00
modmuss50
74d500a2fd
Update to minecraft version 1.9.4
2016-05-18 16:53:54 +01:00
modmuss50
7d95dea783
Update Item Registry
2016-05-17 21:39:07 +01:00
modmuss50
e38c800f21
Added Universal Cell
2016-05-17 21:12:33 +01:00
modmuss50
9035f2a21c
Merge branch '1.9' into 1.9-BTM
2016-05-17 19:55:57 +01:00
modmuss50
90c7ab09ec
Fixes #587
2016-05-17 18:41:09 +01:00
modmuss50
7e2db4a715
Rewrote fluids
...
Now uses json files
Now uses forge bucket
Now not broken, closes #557
2016-05-17 18:36:51 +01:00
modmuss50
c20c6d4722
Fixes #496 and update Json-Destoyer
2016-05-17 11:41:37 +01:00
modmuss50
0ac27fd90e
Fixes #585
2016-05-17 10:35:00 +01:00
modmuss50
aaeb67f9c4
Fixes #583
2016-05-17 10:28:06 +01:00
modmuss50
4a1226322e
Merge branch '1.9' into 1.9-BTM
2016-05-16 16:21:33 +01:00
modmuss50
68b77fca0a
Version 1.1.1
2016-05-16 16:09:28 +01:00
modmuss50
89d9dc99e2
Fixes #381 rubber ore dic issue
2016-05-16 16:04:31 +01:00
modmuss50
4c5cf82db4
Rewrite ores
2016-05-16 15:48:48 +01:00
modmuss50
3fb1e4ceb8
Some improvements to cable rendering
2016-05-16 15:09:59 +01:00
modmuss50
2df4688887
Fixes #578
2016-05-16 14:30:32 +01:00
modmuss50
5a454c2e8b
Fixes #579
2016-05-16 14:29:02 +01:00
Prospector
3cf950d491
Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes.
2016-05-15 21:24:35 -07:00
Prospector
4a05018849
Fix rockcutter
2016-05-15 15:03:13 -07:00
modmuss50
61bf289f43
Complete Distributor
2016-05-15 09:53:38 +01:00
modmuss50
3eb4eec55a
Merge branch '1.9' into 1.9-BTM
2016-05-15 09:39:05 +01:00
modmuss50
6d34d072af
Some small fixes the PDA
2016-05-15 09:35:31 +01:00
Prospector
2410b4852f
remove hot tungstensteel plate...who needs a hot plate anyway?
2016-05-14 22:54:18 -07:00
Prospector
36d736686b
Fix TRArmour texture caps
2016-05-14 14:58:09 -07:00
modmuss50
a170177980
Some more work
2016-05-14 19:26:04 +01:00
modmuss50
cc921dca0a
Re-enabled shield hud rendering
2016-05-14 19:08:22 +01:00
modmuss50
a2063df069
added basic block
2016-05-14 18:53:07 +01:00
modmuss50
3dd6ca4697
Fix small dust textures
2016-05-13 11:07:56 +01:00
modmuss50
0dbae6a781
Fixes 3d person nano saber rendering
2016-05-13 08:35:02 +01:00
modmuss50
960bac8cc2
Fix Server Crash
2016-05-13 07:46:17 +01:00
modmuss50
6ef2285ab6
Fix Server Crash
2016-05-13 07:35:21 +01:00
modmuss50
560147e3b5
Fixed some issues with saving the parts, and broke the movement even more
2016-05-12 21:37:24 +01:00
modmuss50
b0fbd5aea0
Update to support removal of ic2 api
2016-05-12 19:16:40 +01:00
modmuss50
9ecd52436b
Improve fluid propagation, still some issues
2016-05-12 18:41:51 +01:00
Prospector
934cc76089
Frequency Transmitters only stack to 1
2016-05-11 22:37:55 -07:00
Prospector
2f370d5637
Fix localizations and improve chat messages
2016-05-11 18:44:28 -07:00
modmuss50
19adfe5d58
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-05-11 11:17:25 +01:00
modmuss50
7808400028
Fix z-flighting and fluid movement, uv's still need a look at
2016-05-11 11:17:17 +01:00
Prospector
f746df428b
Frequency Transmitter works now
2016-05-10 22:35:09 -07:00
modmuss50
37dc52d6df
Fluid moves, you just loose 1/2 of it
2016-05-10 21:45:54 +01:00
modmuss50
25280e9e7e
Small improvements to cable rendering
2016-05-10 13:10:27 +01:00
modmuss50
5ca379667d
fix building
2016-05-10 07:45:13 +01:00
Prospector
1bcc459865
Make pipes look fancier
2016-05-09 17:38:41 -07:00
modmuss50
6488a9227e
Started work on fluid movement mechanic
2016-05-09 21:37:07 +01:00
modmuss50
a78b2b6745
Bump the windmill eu output
2016-05-09 21:24:37 +01:00
modmuss50
4cd4e4109b
Speed improvement
2016-05-09 18:33:01 +01:00
modmuss50
62fd8f53f6
Added fluid pipe types
2016-05-09 17:27:22 +01:00
modmuss50
fd95cf7141
Some more work on fluid pipe rendering, I may recode it
2016-05-09 16:33:36 +01:00
modmuss50
9fa77d31d8
Fix forge fluid bucket rendering
2016-05-09 16:18:22 +01:00
modmuss50
13d70e1b95
Remove old 1.7 connected texture stuff
2016-05-09 11:15:08 +01:00
modmuss50
dd6e69bea5
Start work on fluid pipes
2016-05-09 11:13:52 +01:00
Prospector
b97e884432
Tinkers' Construct Support
...
Closes #368
2016-05-08 18:02:11 -07:00
modmuss50
45e31c1aef
Added pump
2016-05-08 21:42:09 +01:00
modmuss50
58371903d3
Fix major gig derp
2016-05-08 21:11:17 +01:00
Prospector
a6cfd90339
get tinkers in the dev env (no compat yet)
2016-05-08 10:26:40 -07:00
modmuss50
caaa5a3e7f
Fix sounds
2016-05-08 11:42:59 +01:00
modmuss50
9c6e9aef64
Update to new forge registry system
2016-05-08 10:13:21 +01:00
modmuss50
c9f84375ac
Fixes #549 gui still needs syncing
2016-05-08 10:00:06 +01:00
modmuss50
4c6c88d950
Comment out psi support and remove jar
2016-05-08 09:53:48 +01:00
modmuss50
063558bf71
fixes #555
2016-05-08 09:52:30 +01:00
modmuss50
e71953dc2a
Fixes #556 and fixes #550
2016-05-08 09:34:52 +01:00
modmuss50
140b03960e
Fixes #557
2016-05-08 09:24:16 +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
a060c33e5a
Fixes #522
2016-05-07 13:45:33 +01:00
modmuss50
4095a0b52d
Auto update mappings
2016-05-06 22:13:24 +01:00
modmuss50
595c9575b1
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-05-06 19:49:32 +01:00
Prospector
5ee2bdedf2
Re-register scrapbox category/handler cause I'm a derp
2016-04-30 20:11:20 -07: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
modmuss50
ca73a31efa
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-04-27 17:20:36 +01:00
modmuss50
5773bf66d0
Added offhand stack power hub rendering
2016-04-27 17:19:06 +01:00
Prospector
ab1a2910dd
Get rid of scrapbox code in freq. transmitter :P
2016-04-25 07:00:31 -07:00
modmuss50
eca6144c66
Now with 50% less json file, and fixes
2016-04-25 11:10:06 +01:00
modmuss50
61c7815f3b
Initial json's for machines, gui blocks are broken
2016-04-24 21:49:22 +01: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
Prospector
3e99b11291
Fix build
2016-04-24 10:19:16 -07:00
modmuss50
f33f98690d
Start work on json exporter
2016-04-24 17:24:30 +01:00
Prospector
5e423da58c
Disable psi support for now
2016-04-24 08:33:20 -07:00
modmuss50
e4588c6b52
Fix compile
2016-04-23 21:46:59 +01:00
modmuss50
d8b6cb6351
Added psi build
2016-04-23 21:46:30 +01:00
Prospector
3efacbcd6b
Psi compat code. Broken and will break build. Have fun :P
2016-04-23 13:18:04 -07:00
Prospector
ab51699e5a
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-04-23 13:11:35 -07:00
Prospector
c3f79d6c6f
Update Forge
2016-04-23 13:11:30 -07:00
modmuss50
9561b36661
Now downloads the zip file
2016-04-23 13:52:50 +01:00
modmuss50
a2d626bc61
Fixes #523
2016-04-23 13:32:03 +01:00
modmuss50
b2d5ee7b3d
Fixes #530
2016-04-23 13:23:11 +01:00
modmuss50
e7f9c679df
Update forge and deps
2016-04-23 13:05:39 +01:00
Prospector
0d52c4515e
Fix builds
2016-04-21 20:51:15 -07:00
modmuss50
c66565a90f
Fixes cable rendering, closes #512
2016-04-19 08:26:37 +01:00
modmuss50
e62bcc215e
moved designer to its own repo
2016-04-17 11:48:01 +01:00
modmuss50
a5cd7e38df
fixes crash when running exporter on headless server
2016-04-17 11:29:59 +01:00
modmuss50
8de90e6209
added exporter
2016-04-16 20:28:11 +01:00
modmuss50
55739cdb98
added image support for designer
2016-04-16 13:41:52 +01:00
modmuss50
70f458d089
Added designer jar
2016-04-16 09:02:33 +01:00
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
