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
|
850e39d674
|
Player detector textures, universal cell textures
|
2016-05-22 22:19:49 -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
|
fda54cb37b
|
Diamond saw blade
|
2016-05-22 02:28:36 -07:00 |
|
Prospector
|
40095495f9
|
Grinding heads
|
2016-05-22 02:13:42 -07:00 |
|
Yulife
|
b213535066
|
Dusts \o/
|
2016-05-22 10:23:07 +02:00 |
|
Prospector
|
df27ac6b15
|
Merge branch '1.9.4' of https://github.com/TechReborn/TechReborn into 1.9.4
|
2016-05-21 21:51:39 -07:00 |
|
Prospector
|
8fffe67f17
|
Update to use new ChatUtils
|
2016-05-21 21:51:26 -07:00 |
|
Yulife
|
556084f3d8
|
Unity masterplan
|
2016-05-21 23:06:56 +02: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
|
2e4943cf85
|
Improve cable rendering test.png
|
2016-05-16 17:07:38 +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
|
58037e3c9c
|
Removed In/Output markers on GUIs
|
2016-05-15 16:55:38 -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
|
e01a8ed4c1
|
Bump version
|
2016-04-13 17:14:19 +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
|
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
|
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 |
|
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 |
|
Stuart Pomeroy
|
7249130c0c
|
Give the debug tool a name
|
2016-03-28 21:05:08 +01:00 |
|
Stuart Pomeroy
|
12ab5ecc62
|
Give NukePrimed entity a name.
|
2016-03-28 21:03:52 +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
|
63f31cf673
|
Merge remote-tracking branch 'origin/1.9' into 1.9
|
2016-03-28 19:39:56 +01:00 |
|
Modmuss50
|
30052aac18
|
Quick fix for #427
|
2016-03-28 19:39:10 +01:00 |
|
Prospector
|
0e4983a0f1
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-28 11:36:34 -07:00 |
|
Prospector
|
112502e09c
|
New machine block textures (thanks @Drullkus)
|
2016-03-28 11:36:18 -07: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
|
cfb78eb126
|
Change Machine Block textures, energy crystals, and advanced alloy texture
|
2016-03-28 01:28:05 -07: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
|
dd6af0d09b
|
Textures for previous commit
|
2016-03-27 22:48:42 -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 |
|
gigabit101
|
f4b32cfcef
|
closes #432
|
2016-03-27 20:11:39 +01:00 |
|
Stuart Pomeroy
|
78e8acce7b
|
Fixed some GUIS and some Mass Fabs
|
2016-03-27 20:10:49 +01:00 |
|
gigabit101
|
da4f8fcb4d
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 20:08:55 +01:00 |
|
gigabit101
|
ea9b92139e
|
closes #431
|
2016-03-27 20:08:51 +01:00 |
|
gigabit101
|
2360df0148
|
closes #429
|
2016-03-27 19:53:55 +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
|
52ffbd65df
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 18:56:37 +01:00 |
|
modmuss50
|
1ab2415e40
|
Fix crash, fix #414 and fix #411
|
2016-03-27 18:56:27 +01:00 |
|
modmuss50
|
aeb567deb7
|
Fixes #416
|
2016-03-27 18:38:43 +01:00 |
|
Stuart Pomeroy
|
525a91e931
|
Fixes solar panels being powered wierdly...
|
2016-03-27 18:25:45 +01:00 |
|
modmuss50
|
aceceb7d2d
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 18:21:42 +01:00 |
|
Prospector
|
576f204ce0
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 11:15:08 -07:00 |
|
Prospector
|
40a10cafd9
|
Localize cable tooltips
|
2016-03-27 11:14:59 -07:00 |
|
modmuss50
|
2801535bf8
|
Fixes #426
|
2016-03-27 18:21:31 +01:00 |
|
modmuss50
|
49e45b27e2
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 18:06:50 +01:00 |
|
gigabit101
|
c73d1dc773
|
closes #425
|
2016-03-27 19:05:05 +01:00 |
|
modmuss50
|
8261384cdd
|
Fixes #420
|
2016-03-27 18:06:40 +01:00 |
|
modmuss50
|
cd8de44e79
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-27 17:58:52 +01:00 |
|
Prospector
|
b08ca6b91c
|
Diesel and Semifluid generator GUI textures
Closes #421
|
2016-03-27 10:57:31 -07:00 |
|
Prospector
|
5dad8067eb
|
Hide fluids from JEI
|
2016-03-27 10:30:32 -07:00 |
|
modmuss50
|
5846f1c784
|
Remove debug code, and 1.0.2
|
2016-03-27 17:58:41 +01:00 |
|
Stuart Pomeroy
|
8fba82312c
|
Closes #402,#404,406
|
2016-03-27 17:41:56 +01:00 |
|
modmuss50
|
96464980c2
|
Fixed crash when not running with MCMP
|
2016-03-27 13:14:57 +01:00 |
|
modmuss50
|
a0dea07407
|
Fix multiblocks
|
2016-03-27 12:51:39 +01:00 |
|
Stuart Pomeroy
|
aad396e1b4
|
Revert "Merged branch 1.9 into 1.9"
This reverts commit d142704a15.
|
2016-03-26 17:16:51 +00:00 |
|
Stuart Pomeroy
|
d142704a15
|
Merged branch 1.9 into 1.9
|
2016-03-26 17:16:27 +00:00 |
|
Stuart Pomeroy
|
77818b609e
|
Fix Grinder GUI
|
2016-03-26 17:16:09 +00:00 |
|
Stuart Pomeroy
|
a284c45475
|
Fix Grinder GUI
|
2016-03-26 17:05:44 +00:00 |
|
Stuart Pomeroy
|
267ac7b8a2
|
Fixed Grinder GUI and other?
Just fixed the grinder GUI and stuff.
|
2016-03-26 16:59:12 +00:00 |
|
gigabit101
|
4861364cd6
|
blocks are hard ;)
|
2016-03-26 16:17:56 +00:00 |
|
Stuart Pomeroy
|
c4345bacae
|
Fix a fuck up.
|
2016-03-26 16:01:06 +00:00 |
|
Stuart Pomeroy
|
6498bd1974
|
Update to forge and fuck up the cables? Not sure :P
|
2016-03-26 15:58:38 +00: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
|
710f9c04e7
|
gui fixs
|
2016-03-23 23:31:40 +00:00 |
|
gigabit101
|
1a580bb1d1
|
Fixed guis
|
2016-03-23 21:36:58 +00:00 |
|
modmuss50
|
887708d128
|
Fixed player detector crash
|
2016-03-23 20:10:08 +00:00 |
|
modmuss50
|
244ade085d
|
Some small fixes
|
2016-03-23 20:00:00 +00:00 |
|
modmuss50
|
a1078a4951
|
Added WIP tool tip
|
2016-03-23 18:59:39 +00:00 |
|
gigabit101
|
1d9fe100b1
|
Recipes and debug texture
|
2016-03-23 18:45:58 +00:00 |
|
gigabit101
|
ad2c34e969
|
Textures
|
2016-03-23 18:21:55 +00:00 |
|
gigabit101
|
a999d5064a
|
another recipe
|
2016-03-23 18:19:42 +00:00 |
|
gigabit101
|
f31d50c81e
|
added missing loc
|
2016-03-23 18:19:34 +00:00 |
|
gigabit101
|
5c7035c389
|
Added a but ton of recipes
|
2016-03-23 18:17:37 +00:00 |
|
modmuss50
|
4d55b94a0a
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-23 18:08:45 +00:00 |
|
modmuss50
|
d9eded60cc
|
Remove explode sub command
|
2016-03-23 18:08:29 +00:00 |
|
gigabit101
|
bd37e8ad7f
|
3D Wrench
|
2016-03-23 17:05:21 +00:00 |
|
modmuss50
|
8f3b3ede78
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-23 17:02:34 +00:00 |
|
modmuss50
|
f0d6b9e78d
|
Can now place blocks facing up and down
|
2016-03-23 17:02:21 +00:00 |
|
gigabit101
|
8945aa1634
|
Added missing localizations
|
2016-03-23 17:00:41 +00:00 |
|
gigabit101
|
17ff9b2aad
|
some texture fixs
|
2016-03-23 16:53:32 +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 |
|
gigabit101
|
6d1a8a835e
|
more gui things
|
2016-03-22 23:58:16 +00:00 |
|
gigabit101
|
123e704caf
|
fixed some machine drops
|
2016-03-22 23:34:43 +00:00 |
|
gigabit101
|
42015809a3
|
some missing localizations
|
2016-03-22 23:30:08 +00:00 |
|
gigabit101
|
5ea4dedcb2
|
Fixed some progress bars
|
2016-03-22 23:27:35 +00:00 |
|
modmuss50
|
ab19d71ede
|
Moved shields to RebornCore
|
2016-03-22 20:30:59 +00:00 |
|
modmuss50
|
eec6139d33
|
Update forge + powernet improvements
|
2016-03-22 20:03:46 +00:00 |
|
modmuss50
|
1c297634d7
|
Some fixes??
|
2016-03-21 20:37:08 +00:00 |
|
modmuss50
|
0c85662e14
|
derp, fix compile
|
2016-03-21 19:46:49 +00:00 |
|
modmuss50
|
aa64b1a8d6
|
Added more walia support, fix building
|
2016-03-21 19:45:48 +00:00 |
|
modmuss50
|
4f3d9ddfca
|
Shields
|
2016-03-21 19:36:54 +00:00 |
|
gigabit101
|
32027f948c
|
Re added waila support for blocks
|
2016-03-21 16:56:20 +00:00 |
|
gigabit101
|
1acdc13e2d
|
Guis for batbox, mfe, mfsu
|
2016-03-21 15:52:46 +00:00 |
|
gigabit101
|
8f382f2239
|
stuff and things
|
2016-03-21 15:30:32 +00:00 |
|
modmuss50
|
5fde39ebcd
|
Some improvements to things
|
2016-03-20 21:23:12 +00:00 |
|
modmuss50
|
fee31761b1
|
Fix NPE
|
2016-03-20 19:51:41 +00:00 |
|
modmuss50
|
b31806d004
|
Added more recipe things
|
2016-03-20 17:23:36 +00:00 |
|
modmuss50
|
d66c2e8301
|
Added debug items
|
2016-03-20 16:43:25 +00:00 |
|
modmuss50
|
d8829fd33c
|
Fix some small issues
|
2016-03-20 16:27:57 +00:00 |
|
modmuss50
|
4a0fd93363
|
More powernet fixes
|
2016-03-20 16:23:30 +00:00 |
|
modmuss50
|
14d22e2442
|
Remove debug message
|
2016-03-20 16:04:01 +00:00 |
|
modmuss50
|
d8bc90e18c
|
Fixed crash with power net
|
2016-03-20 15:59:09 +00:00 |
|
gigabit101
|
b34e6df827
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-20 15:52:30 +00:00 |
|
gigabit101
|
11c10601a0
|
forgot to do this here
|
2016-03-20 15:47:09 +00:00 |
|
Rushmead
|
af9ed84015
|
Fixed Cable rendering
|
2016-03-20 15:44:19 +00:00 |
|
gigabit101
|
24c806d68a
|
Some texture fix's
|
2016-03-20 15:39:25 +00:00 |
|
modmuss50
|
431c05161a
|
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
|
2016-03-20 15:32:34 +00:00 |
|
modmuss50
|
8f3811c9d8
|
A load of fixes to the power net, should be better, but needs testing
|
2016-03-20 15:32:22 +00:00 |
|
gigabit101
|
f3016ed07d
|
Some recipes
|
2016-03-20 15:28:40 +00:00 |
|
modmuss50
|
5460f2f9a2
|
Fixed crashes
|
2016-03-20 12:10:23 +00:00 |
|
modmuss50
|
edc8531b2d
|
Some small power net tweaks, should make some things more stable
|
2016-03-20 11:10:27 +00:00 |
|
modmuss50
|
232fe0b625
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-20 11:10:06 +00:00 |
|
modmuss50
|
492917ac95
|
Improvements to cable rendering. still broken, but not as bad
|
2016-03-20 10:58:58 +00:00 |
|
gigabit101
|
d9666edb4f
|
few little grinder recipes
|
2016-03-20 01:05:53 +00:00 |
|
gigabit101
|
2fa00b9c7f
|
little fixs
|
2016-03-19 23:18:31 +00:00 |
|
modmuss50
|
471a945de6
|
Its all broke, mcmultipart support
|
2016-03-19 18:01:34 +00:00 |
|
modmuss50
|
d5935af4e3
|
Fixes missing ore texture
|
2016-03-19 10:10:53 +00:00 |
|
modmuss50
|
2bbc785dde
|
Re-added JEI support, and update things
|
2016-03-18 08:29:29 +00:00 |
|
modmuss50
|
1d9dc46cda
|
Last test:
|
2016-03-16 22:03:49 +00:00 |
|
modmuss50
|
2f00c851cd
|
Fixes #TR-6
|
2016-03-16 22:00:46 +00:00 |
|
modmuss50
|
980c2ec4fb
|
Closes TR-6
|
2016-03-16 21:59:44 +00:00 |
|
modmuss50
|
e319398bc9
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-16 17:09:34 +00:00 |
|
modmuss50
|
04f58c1ebe
|
Added textures to transformers
|
2016-03-16 17:08:57 +00:00 |
|
modmuss50
|
51539f4ec8
|
Remove item transformers
|
2016-03-16 17:04:19 +00:00 |
|
Prospector
|
a9eb7e6b42
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-16 10:01:28 -07:00 |
|
modmuss50
|
ba4517d38c
|
Fix cables not always breaking
|
2016-03-16 16:59:50 +00:00 |
|
Prospector
|
985bd956bc
|
[TEXTURES] Transformer textures
|
2016-03-16 09:58:22 -07:00 |
|
modmuss50
|
5a0f8be435
|
Added transformers
|
2016-03-16 16:54:44 +00:00 |
|
modmuss50
|
04edbabdf4
|
fix compile error
|
2016-03-16 16:39:40 +00:00 |
|
modmuss50
|
f532ce15c0
|
Stop nuke's exploding when broken
|
2016-03-16 16:38:44 +00:00 |
|
modmuss50
|
00fc80b071
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-16 16:26:44 +00:00 |
|
modmuss50
|
65a64e650b
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-16 15:52:36 +00:00 |
|
modmuss50
|
929d2f4b7f
|
Improvements to the nuke, rendering needs fixing
|
2016-03-16 15:52:27 +00:00 |
|
TheDoctorSoda
|
c4a00c8152
|
[TEXTURES] LV, MV, and HV transformers.
|
2016-03-15 11:03:26 -07:00 |
|
modmuss50
|
8c24711d4f
|
Optimise imports
|
2016-03-15 08:13:05 +00:00 |
|
modmuss50
|
e0547cecff
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-15 08:07:06 +00:00 |
|
modmuss50
|
5b183ac231
|
Fix fence rendering
|
2016-03-15 07:50:12 +00:00 |
|
TheDoctorSoda
|
e90592403b
|
Added Scrapboxinator, reverted yellow energy outlines, added grinder textures
|
2016-03-14 21:53:05 -07:00 |
|
TheDoctorSoda
|
5c07626959
|
[TEXTURES] Yellow "energyslots"
|
2016-03-14 13:39:40 -07:00 |
|
TheDoctorSoda
|
3a206ce9f8
|
[TEXTURES] Made GUIs more user-friendly
|
2016-03-14 13:34:46 -07:00 |
|
TheDoctorSoda
|
7496777169
|
[TEXTURES] Change AESU, IDSU, and LESU gui
|
2016-03-14 12:23:07 -07:00 |
|
TheDoctorSoda
|
427d5e7f2c
|
[TEXTURES] AESU, IDSU, and LESU
|
2016-03-14 12:16:11 -07:00 |
|
TheDoctorSoda
|
bb16153e77
|
Fix MFE and MFSU paths
|
2016-03-14 11:25:12 -07:00 |
|
TheDoctorSoda
|
2a2a0283d8
|
[TEXTURES] MFE and MFSU
|
2016-03-14 11:22:24 -07:00 |
|
modmuss50
|
54c7827bb2
|
Fixes subitem rendering
|
2016-03-14 13:28:33 +00:00 |
|
modmuss50
|
b7c71edf4f
|
Added MFE and MFSU blocks and tiles, gui and textures to come later
|
2016-03-14 08:34:15 +00:00 |
|
modmuss50
|
5480a5c3e5
|
Added batBox, gui to come later
|
2016-03-14 08:26:41 +00:00 |
|
modmuss50
|
ec67e9650d
|
Fixed building?
|
2016-03-14 07:56:36 +00:00 |
|
modmuss50
|
849f68bc94
|
Trying to fix git part 1
|
2016-03-14 07:55:54 +00:00 |
|
modmuss50
|
4cf4be51c8
|
Fix building
|
2016-03-14 07:51:34 +00:00 |
|
TheDoctorSoda
|
d66315ae2c
|
Some guis
|
2016-03-14 01:03:46 -07:00 |
|
TheDoctorSoda
|
801b497d86
|
Update some texture paths, fix ore harvestibility, and fix ore recipes
|
2016-03-13 22:25:06 -07:00 |
|
TheDoctorSoda
|
72b2f01b9a
|
[TEXTURES] Batbox
|
2016-03-13 21:12:04 -07:00 |
|
TheDoctorSoda
|
b0fa75a3bd
|
Fixed some things I forgot in last commit
|
2016-03-13 21:11:22 -07:00 |
|
TheDoctorSoda
|
7d5fe7f19a
|
Changed lots of texture paths. There will be some missing ones, I'll resolve those later.
|
2016-03-13 20:27:15 -07:00 |
|
modmuss50
|
72b16c2306
|
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
|
2016-03-13 21:14:41 +00:00 |
|
TheDoctorSoda
|
2e4327f8cb
|
Fix reinforced glass
|
2016-03-13 12:52:37 -07:00 |
|
TheDoctorSoda
|
d8e06e81bb
|
[TEXTURES] accidently pushed WIP auto input texture
|
2016-03-13 12:09:18 -07:00 |
|
TheDoctorSoda
|
fcb1c69804
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-13 12:07:57 -07:00 |
|
TheDoctorSoda
|
692620618c
|
[TEXTURES] Some textures
|
2016-03-13 12:07:46 -07:00 |
|
modmuss50
|
32f25a0141
|
Its gets to main menu
|
2016-03-13 18:38:41 +00:00 |
|
modmuss50
|
cc0b762b56
|
87 errors, will finish later
|
2016-03-13 17:38:12 +00:00 |
|
modmuss50
|
7a121be651
|
Some small fixes
|
2016-03-13 16:57:10 +00:00 |
|
modmuss50
|
b4a16c03ed
|
And 50 more errors fixed
|
2016-03-13 16:15:27 +00:00 |
|
modmuss50
|
9a40abbe78
|
Now comes the grind, 244 errors left
|
2016-03-13 16:08:30 +00:00 |
|
modmuss50
|
7f920b282f
|
Optimise imports to make it easier to find and replace package names
|
2016-03-13 15:37:55 +00:00 |
|
modmuss50
|
05ee9f30f4
|
Nuke.
|
2016-03-13 11:50:46 +00:00 |
|
modmuss50
|
3a99ebcf02
|
Explosion command
|
2016-03-12 15:43:32 +00:00 |
|
modmuss50
|
dc1ff4754c
|
Retro gen, enable in ores.json config file, disable once ran
|
2016-03-12 11:47:05 +00:00 |
|
modmuss50
|
3d082d8b82
|
Removed unused config properties
|
2016-03-11 20:28:01 +00:00 |
|
modmuss50
|
28dda59ed5
|
Rewritten world generation, new ores.json config file
|
2016-03-11 20:24:05 +00:00 |
|
modmuss50
|
8ab9ecd28e
|
More work on the new ore config, please leave feedback
|
2016-03-11 13:31:42 +00:00 |
|
modmuss50
|
82043cadc4
|
Move config files into own dir
|
2016-03-11 13:09:59 +00:00 |
|
modmuss50
|
ee05dd5cb5
|
Initial draft on new ore config file
|
2016-03-11 11:21:14 +00:00 |
|
modmuss50
|
62fb79a6b0
|
Added world clear command to test ores
|
2016-03-11 11:01:51 +00:00 |
|
modmuss50
|
a23286d0e7
|
Fixes #374
|
2016-03-10 21:48:07 +00:00 |
|
gigabit101
|
4516b9023f
|
Nanosaber on/off state is now NBT
|
2016-03-09 15:03:26 +00:00 |
|
gigabit101
|
a938a1ab4d
|
Thermal gen now shows stored power in gui
|
2016-03-09 15:03:09 +00:00 |
|
gigabit101
|
d069bf77e3
|
closes #377
|
2016-03-09 13:59:38 +00:00 |
|
gigabit101
|
e1cd18ad7d
|
closes #376
|
2016-03-09 13:46:08 +00:00 |
|
modmuss50
|
27933be02c
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-09 08:35:22 +00:00 |
|
modmuss50
|
9ac1db6dc1
|
Fixes #375
|
2016-03-09 08:35:06 +00:00 |
|
TheDoctorSoda
|
389ec27129
|
[TEXTURES] bronze tools and armour item textures
|
2016-03-08 19:35:04 -08:00 |
|
TheDoctorSoda
|
f2224beb99
|
[TEXTURES] Recycler front
|
2016-03-08 18:14:42 -08:00 |
|
TheDoctorSoda
|
618088feaf
|
[TEXTURES] Alloy furnace retexture
|
2016-03-08 17:58:41 -08:00 |
|
modmuss50
|
6765756e2d
|
Some more fixes to the energy net
|
2016-03-08 18:55:40 +00:00 |
|
modmuss50
|
7e5e40a338
|
Added machine teirs (can someone check them)
Fixed crash when machines explode
|
2016-03-08 17:34:04 +00:00 |
|
modmuss50
|
0de43bfe2d
|
Initial work on machine explosions, I will need to update the API to allow finer control over what explodes
|
2016-03-08 13:20:14 +00:00 |
|
modmuss50
|
58b202a782
|
Fixes transparency on glass
|
2016-03-08 08:33:38 +00:00 |
|
TheDoctorSoda
|
02dd024e83
|
Scrapboxes work in dispensers (w/ config option)
|
2016-03-08 00:15:34 -08:00 |
|
TheDoctorSoda
|
c5302f8d6b
|
Add description page to JEI on how to obtain sap
|
2016-03-07 23:15:53 -08:00 |
|
TheDoctorSoda
|
5f77e1b16f
|
Iron furnace burning particles & [TEXTURES] Iron Furnace textures
|
2016-03-07 22:33:13 -08:00 |
|
TheDoctorSoda
|
2221a303ad
|
Move thermal generator TE to proper package
|
2016-03-07 21:56:37 -08:00 |
|
TheDoctorSoda
|
60ae28ad49
|
Uninsulated cable Sound/Particle/Damage configs
|
2016-03-07 21:46:29 -08:00 |
|
TheDoctorSoda
|
29c43ddd99
|
Fix thermal generator texture and adjust nanosaber speed
|
2016-03-07 20:47:40 -08:00 |
|
TheDoctorSoda
|
b0fda3c4da
|
[TEXTURES] Animated generator and added reinforcedglass
|
2016-03-07 20:39:29 -08:00 |
|
modmuss50
|
f966cdb632
|
Power net is working (just)
|
2016-03-07 21:45:06 +00:00 |
|
modmuss50
|
67526480ad
|
Added walia support for the cables
|
2016-03-07 20:33:08 +00:00 |
|
modmuss50
|
cebef75338
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-07 19:06:11 +00:00 |
|
modmuss50
|
10c593e3c1
|
Initial work on new power network
|
2016-03-07 19:05:56 +00:00 |
|
gigabit101
|
516e64792c
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-07 17:26:15 +00:00 |
|
gigabit101
|
626cbbbbc7
|
derp
|
2016-03-07 17:26:04 +00:00 |
|
modmuss50
|
a9fed5d933
|
Middle click cables, calmed the nanosaber down.
|
2016-03-07 17:25:03 +00:00 |
|
gigabit101
|
080b633493
|
Finish up on recycler and temp jei handler
|
2016-03-07 14:07:52 +00:00 |
|
gigabit101
|
007f9266e5
|
Recycler output is now a random chance
|
2016-03-07 12:45:54 +00:00 |
|
TheDoctorSoda
|
f170f9a418
|
Fix Scrapbox JEI handler localisation
|
2016-03-06 23:56:15 -08:00 |
|
TheDoctorSoda
|
1a1ec6fee8
|
[TEXTURES] Energy storage upgrade and wrench update & more scrapbox loot
|
2016-03-06 23:47:17 -08:00 |
|
TheDoctorSoda
|
38af4881b4
|
Started nanosaber, needs work but wanted to get the item in.
|
2016-03-06 23:01:02 -08:00 |
|
TheDoctorSoda
|
6822bf4101
|
[TEXTURES] Lapotron and Energy crystals
|
2016-03-06 22:43:37 -08:00 |
|
TheDoctorSoda
|
ca3cd6d4f8
|
Scrapbox JEI handler and modified some scrapbox recipes
This is my first JEI handler, kinda just stole it from the compressor. hope I did good?
|
2016-03-06 22:23:25 -08:00 |
|
TheDoctorSoda
|
a379360ef5
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-06 18:37:25 -08:00 |
|
TheDoctorSoda
|
c19b792960
|
[TEXTURES] Cables and refined iron
|
2016-03-06 18:37:10 -08:00 |
|
gigabit101
|
77e2edc005
|
More work on recycler
|
2016-03-07 00:21:22 +00:00 |
|
gigabit101
|
fa5c568adf
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-06 23:15:33 +00:00 |
|
gigabit101
|
02ac62a180
|
Started Recycler
|
2016-03-06 23:15:28 +00:00 |
|
TheDoctorSoda
|
fcd594e512
|
[TEXTURES] Cable block textures
|
2016-03-06 14:27:21 -08:00 |
|
TheDoctorSoda
|
b7e918a175
|
[TEXTURES] The rest of the cable item textures
|
2016-03-06 14:00:19 -08:00 |
|
TheDoctorSoda
|
d6dd706f9c
|
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
|
2016-03-06 13:52:26 -08:00 |
|
TheDoctorSoda
|
d4d7d2c257
|
Nanosaber textures
|
2016-03-06 13:51:49 -08:00 |
|
modmuss50
|
57f91f3159
|
Cables now shock the entity's
|
2016-03-06 21:42:27 +00:00 |
|
gigabit101
|
e6c510bbea
|
Fixed machines returning wrong itemstack when wrenched
|
2016-03-06 21:03:20 +00:00 |
|
gigabit101
|
059b197d5c
|
More recipe tweaks
|
2016-03-06 21:00:42 +00:00 |
|
gigabit101
|
5f1d059058
|
Added logic to Electric furnace
|
2016-03-06 20:39:31 +00:00 |
|
gigabit101
|
d02424070d
|
Recipe tweak
|
2016-03-06 20:22:43 +00:00 |
|
gigabit101
|
87d41aaa53
|
Small code clean up
|
2016-03-06 20:14:42 +00:00 |
|
gigabit101
|
b99df6f0a8
|
Iron furnace and Iron alloy furnace now return when broken
|
2016-03-06 20:09:30 +00:00 |
|
gigabit101
|
90f5d77a41
|
Finish on Iron furnace
Added Jei support to Iron Furnace
|
2016-03-06 19:59:39 +00:00 |
|
gigabit101
|
961e821402
|
Start on Iron furnace
|
2016-03-06 15:58:34 +00:00 |
|
gigabit101
|
a84075ff69
|
Nerfed generator and fix generator gui
|
2016-03-06 15:42:12 +00:00 |
|
gigabit101
|
b7212bec69
|
Fixed generator not storing inv
|
2016-03-06 15:20:38 +00:00 |
|
