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