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 |
|
