Aidan C. Brady
|
5c2c8e15cb
|
Add in necessary models
|
2013-12-02 12:41:00 -05:00 |
|
Calclavia
|
07332ca245
|
Merge branch 'master' into universal-wires
Conflicts:
common/mekanism/induction/common/MekanismInduction.java
resources/assets/mekanism/lang/en_US.lang
|
2013-12-02 19:47:38 +08:00 |
|
|
Aidan Brady
|
e42ab62e2a
|
Begin work on copper and tin ore and ingots :)
|
2013-12-01 21:58:35 -05:00 |
|
|
Aidan Brady
|
83bca26455
|
Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness
|
2013-12-01 17:45:19 -05:00 |
|
|
Calclavia
|
c1d5e2bc60
|
Fixed non-multipart insulated wire texture
|
2013-12-01 18:05:27 +08:00 |
|
|
Calclavia
|
3cca65f2cd
|
Fixed non-multipart wire textures
|
2013-12-01 17:02:39 +08:00 |
|
|
Calclavia
|
a674e14851
|
Fixed wire texture not loading
|
2013-12-01 14:33:30 +08:00 |
|
|
Calclavia
|
10bbcff077
|
Fixed Multipart wires not loading
|
2013-12-01 14:30:54 +08:00 |
|
|
Calclavia
|
0205d7722e
|
Readded universal wires into Mekanism Induction
|
2013-12-01 13:46:15 +08:00 |
|
|
Aidan Brady
|
c10ba92522
|
Connected Dynamic Glass textures :)
|
2013-11-24 19:30:52 -05:00 |
|
|
Aidan Brady
|
38d9bdd1d2
|
Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481)
|
2013-11-24 18:54:11 -05:00 |
|
|
Aidan C. Brady
|
59b945a33f
|
Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup
|
2013-11-24 12:12:42 -06:00 |
|
|
Aidan C. Brady
|
cc48b614ba
|
Remove wire
|
2013-11-16 12:26:49 -05:00 |
|
|
Aidan C. Brady
|
53323279c7
|
MekanismInduction module - done!
Still need to configure the build
|
2013-11-16 10:21:37 -05:00 |
|
|
Aidan C. Brady
|
e6ed263aa3
|
More bin work! :D
|
2013-11-12 18:42:55 -05:00 |
|
|
Aidan C. Brady
|
fe0631844b
|
Some work on Bins
|
2013-11-12 16:45:48 -05:00 |
|
|
Aidan C. Brady
|
51289b82c2
|
Made base code for Logistical Sorter, this may end up being more complex than the transporters themselves.
|
2013-10-25 00:23:38 -04:00 |
|
|
Aidan Brady
|
54ac6bac5c
|
Deleted old files
|
2013-10-23 22:50:10 -04:00 |
|
|
Aidan Brady
|
cfc5dff445
|
First 1.6 push, still work to be done
|
2013-07-20 12:10:14 -04:00 |
|