Aidan
3ebbc41bda
Merge pull request #909 from Vexatos/patch-1
...
Update de_DE.lang
2014-01-25 11:10:21 -08:00
Vexatos
cb38414abc
Update de_DE.lang
2014-01-25 06:45:52 +01:00
Aidan C. Brady
ba62cc5cb1
Fix that sound issue
2014-01-23 17:06:33 -05:00
Aidan C. Brady
7537d53027
Fix JABBA dupe bug
2014-01-23 16:58:52 -05:00
Aidan C. Brady
eca663a3a3
Added missing macerator recipes
2014-01-23 14:47:55 -05:00
Aidan C. Brady
a2c392f03d
Fixed dumb cardboard boxes
2014-01-22 14:37:25 -05:00
Aidan C. Brady
e11a79b3c3
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-22 07:43:34 -05:00
Aidan C. Brady
a001abda66
Fix Cardboard Box recipe
2014-01-22 07:43:28 -05:00
Aidan Brady
56943c8e2b
Fix transmitter issue
2014-01-21 21:05:27 -05:00
Aidan Brady
f80341ca9d
Clean Slurry textures
2014-01-21 18:19:39 -05:00
Aidan C. Brady
0a0e329223
Ore gasses! For use in T4 (5x) ore processing.
2014-01-21 17:58:00 -05:00
Aidan C. Brady
7c5fe23833
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-21 11:28:49 -05:00
Aidan C. Brady
6f723f64bd
Crystals! Currently useless.
2014-01-21 11:28:43 -05:00
Aidan Brady
1ca4aa6fcd
Factories now accept proper gasses
2014-01-20 16:35:42 -05:00
Aidan C. Brady
57744e791d
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-19 20:32:22 -05:00
Aidan C. Brady
52aa704a74
Add in textures for some future stuff
2014-01-19 20:32:16 -05:00
Aidan
3bcccbe1ee
Merge pull request #877 from Mierzen/development
...
Update textures to be more understandable
2014-01-19 15:25:33 -08:00
Mierzen
8aa3f94a9c
Update textures to be more understandable
...
Advanced Solar Generator: Removed the gray parts at the bottom, leaving
only one red "output port".
Wind Turbine: Added an "output port", since it did not have one.
I also changed the red block to a green one (now it looks similar to the
green energy inside the universal cables)
2014-01-19 18:48:04 +02:00
Aidan C. Brady
ad38b6f52b
Minor fix
2014-01-18 15:31:00 -05:00
Aidan C. Brady
93b7321dea
T3 ore processing now uses Hydrogen Chloride
2014-01-18 15:10:17 -05:00
Aidan C. Brady
8c05c53b40
A few recipe enhancements
2014-01-18 14:04:51 -05:00
Aidan C. Brady
740f4581b0
Fix NEI support to dynamically accept different gas types
2014-01-18 12:16:14 -05:00
Aidan Brady
ee2b81c3fd
Fix up Clay Block recipe
2014-01-18 12:08:11 -05:00
Aidan C. Brady
31fbf5ee14
Added clay recipe, thanks @VapourDrive!
2014-01-18 11:41:41 -05:00
Aidan C. Brady
769a8a8e0c
Work on things!
2014-01-18 11:26:24 -05:00
Aidan Brady
a4017fcc0e
Work on things!
2014-01-18 02:31:36 -05:00
Aidan Brady
6eb72a7e44
Whoops! Fixed crash…
2014-01-18 00:50:56 -05:00
Aidan Brady
f5c607bef0
Fix up blacklist for cardboard boxes!
2014-01-18 00:45:27 -05:00
Aidan C. Brady
705352e7c4
Finish NEI support for Advanced Machines (I think)
2014-01-18 00:28:42 -05:00
Aidan C. Brady
7db4a114f6
Fixes
2014-01-17 21:29:39 -05:00
Aidan C. Brady
0314b11edb
Hopefully fix some things
2014-01-17 20:38:05 -05:00
Aidan C. Brady
74a64b3373
pulpWood for sawdust
2014-01-17 18:07:29 -05:00
Aidan C. Brady
310e36edf7
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-17 11:18:10 -05:00
Aidan C. Brady
9b7abb8d96
Added null check
2014-01-17 11:18:04 -05:00
Aidan
c812474277
Merge pull request #853 from Mierzen/patch-2
...
Re-update Elec. Seperator and Sawmill tooltip
2014-01-17 08:15:45 -08:00
Mierzen
b9018c8dce
Re-update Elec. Seperator and Sawmill tooltip
...
Changed my previous edit: made the multiline tooltip display better ("more square")
2014-01-17 17:29:00 +02:00
Aidan C. Brady
61306fd664
More work on things
2014-01-17 09:17:38 -05:00
Aidan C. Brady
95a3084897
Work on basic block multi-id-meta stuff
2014-01-17 07:33:34 -05:00
Aidan C. Brady
af1ab186d9
Finish Salination Controller rendering, start work on a separate Salination Controller block.
...
..this means a lot of extra work to get multiple-id-meta-handling working with BasicBlocks.
2014-01-16 22:49:48 -05:00
Aidan C. Brady
0f06146292
You think sleep can stop me? HA!
...
...work on rendering.
2014-01-16 22:12:51 -05:00
Aidan Brady
41b2d1c2bb
Start on Salination Plant fancy render
2014-01-16 21:55:29 -05:00
Aidan Brady
44ae2e8606
Added null check for Vaygrim
2014-01-16 21:41:14 -05:00
Aidan Brady
fedb728709
Oops!
2014-01-16 21:36:32 -05:00
Aidan Brady
db029274f7
Fix up GUIs
2014-01-16 21:31:30 -05:00
Aidan Brady
175f3e8646
Got GUIs working with new fanciness
2014-01-16 21:26:40 -05:00
Aidan Brady
9acc264726
A few fixes
2014-01-16 20:50:59 -05:00
Aidan Brady
da6c0a2c90
Finish base code for gas-based advanced machinery
2014-01-16 20:35:05 -05:00
Aidan Brady
4fb335b7d3
Lay down framework for gas-based advanced machines
2014-01-16 19:00:53 -05:00
Aidan Brady
1de691be1d
Fix stacking of brine buckets
2014-01-16 16:49:19 -05:00
Aidan Brady
6d366c0475
Brine Buckets!
2014-01-16 16:47:35 -05:00
