Aidan C. Brady
|
e38cf10ef6
|
Merge branch 'universal-wires' of https://github.com/aidancbrady/Mekanism
|
2013-12-02 11:42:21 -05:00 |
|
Aidan C. Brady
|
20d3eb42b2
|
Add needed ingot recipes & textures
|
2013-12-02 09:24:52 -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 |
|
Aidan Brady
|
7ebd132b6e
|
Fixed teslas, merged Electrostatic Linker into Configurator
|
2013-12-01 14:03:00 -05:00 |
|
Calclavia
|
0205d7722e
|
Readded universal wires into Mekanism Induction
|
2013-12-01 13:46:15 +08: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 Brady
|
be73495110
|
…and part 2. Textures fixed.
|
2013-11-17 13:52:23 -05:00 |
|
Aidan Brady
|
80bdfc10b9
|
For some reason this is necessary. Part 1…
|
2013-11-17 13:52:10 -05:00 |
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05: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 Brady
|
c3fa020561
|
New Electric Pump model!
|
2013-11-03 12:07:23 -05:00 |
|
Aidan C. Brady
|
91a8839203
|
Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal.
|
2013-11-01 11:33:00 -04:00 |
|
Aidan C. Brady
|
0d7b2414ce
|
Walkie Talkie foundation! :D
|
2013-10-13 12:31:26 -04:00 |
|
Aidan C. Brady
|
b1c2afd68d
|
Add proper IC2 item support, add maganese for future use
|
2013-10-13 01:01:30 -04:00 |
|
Aidan Brady
|
55fee96644
|
Updated IC2 API (again), added obsidian 200% ore-to-dust processing
|
2013-08-25 12:02:25 -04:00 |
|
Aidan Brady
|
cfc5dff445
|
First 1.6 push, still work to be done
|
2013-07-20 12:10:14 -04:00 |
|