tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1632 commits 2 branches 0 tags 102 MiB
Commit graph

73 commits

Author SHA1 Message Date
Aidan C. Brady
1500bfe929 Filter Cards, all done 2014-03-08 17:47:39 -05:00
Aidan Brady
f165a6a753 Whoops! Got rid of the old Atomic Disassembler icon 2014-03-01 17:49:41 -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
6f723f64bd Crystals! Currently useless. 2014-01-21 11:28:43 -05:00
Aidan C. Brady
52aa704a74 Add in textures for some future stuff 2014-01-19 20:32:16 -05:00
Aidan C. Brady
93b7321dea T3 ore processing now uses Hydrogen Chloride 2014-01-18 15:10:17 -05:00
Aidan C. Brady
61306fd664 More work on things 2014-01-17 09:17:38 -05:00
Aidan Brady
4fb335b7d3 Lay down framework for gas-based advanced machines 2014-01-16 19:00:53 -05:00
Aidan Brady
6d366c0475 Brine Buckets! 2014-01-16 16:47:35 -05:00
Aidan Brady
4d29a57a27 A few fixes, new textures 2014-01-16 16:31:05 -05:00
Aidan C. Brady
83ee208fb7 Added a few cool textures, neatened up Salination Tank structure code 2014-01-13 23:53:56 -05:00
Aidan Brady
71cfd3cd84 Better textures, sounds for Chemical Infuser, Chemical Oxidizer & Precision Sawmill, sounds now fade in 2014-01-13 22:27:47 -05:00
Aidan C. Brady
b82f96d19b Fixed a few textures, added Salt, added NEI recipe handler for Precision Sawmill 2014-01-13 15:41:23 -05:00
Aidan C. Brady
301691729f Fixed Cardboard side texture 2014-01-13 15:05:26 -05:00
Aidan C. Brady
dd8e77d918 Precision Sawmill textures 2014-01-13 12:22:23 -05:00
Aidan C. Brady
19b36e901b Work on Precision Sawmill, added Sawdust, finished ChanceMachine tile and recipe foundation 2014-01-12 23:55:42 -05:00
Aidan C. Brady
89a70f4444 Cardboard Boxes. Yep :) 2014-01-12 21:23:34 -05:00
Ben Spiers
6fa8cebb3a Make a start on the Salination plant. Primitive so far but the multiblock system just about works. 2014-01-11 23:35:39 +00:00
Aidan C. Brady
e2cdf625c1 New Hydrogen Chloride texture 2014-01-10 15:27:12 -05:00
Ben Spiers
333afdc79b Remove the old transmitter renderer, enable the new one to render in hand and inventory 2014-01-07 16:22:59 +00:00
Ben Spiers
0193659c74 Switch the injection chamber to use HCl, up the difficulty of obtaining sulphur dust to prepare for sulphuric acid's use in top-tier processing. 2014-01-05 16:22:41 +00:00
Aidan Brady
2cf27c698d Added Compressed Redstone as an efficient means of obtaining redstone infuse 2014-01-02 23:46:23 -05:00
Ben Spiers
87a95e0732 Add Chlorine, do more E. Separator work, including temporary lava/brine substitute. I think it's pretty much finished for now, though maybe it could do with a new model. 2014-01-03 00:28:34 +00:00
Ben Spiers
a07ca18997 Change to Infuser for final stage of the contact process 2014-01-01 19:55:18 +00:00
Ben Spiers
544d96f3bc Get most of the contact process stuff working with WIP textures and such. .langs will need updating again for new things (Chemical Combiner is a provisional name though, for the time being.) 2014-01-01 03:03:23 +00:00
Aidan C. Brady
1477b6ba7c Finished shard textures 2013-12-24 11:40:19 -05:00
Aidan C. Brady
4cfee657a0 Begin work on shard textures, still have a few to go 2013-12-24 11:17:52 -05:00
Aidan C. Brady
a41760affd Chemical Injection Chamber initial work 2013-12-24 00:23:30 -05:00
Aidan Brady
f2d202d90f Work on transporters 2013-12-20 17:46:24 -05:00
Ben Spiers
98c8068a0f Get Mechanical Pipe rendering working a bit better. 2013-12-12 20:23:03 +00:00
Aidan Brady
31f8566a1f Merge branch 'master' into multipart-experimental-new 
Conflicts:
	common/mekanism/common/Mekanism.java
 2013-12-12 08:43:21 -05:00
Aidan Brady
faa127ddd8 Add textures for Sulfuric Gas & Sulfuric Acid 2013-12-11 20:46:39 -05:00
Aidan Brady
250ddadcf0 Dictionary! :) 2013-12-09 20:52:49 -05:00
Aidan Brady
3c4d776e24 Added lead ore processing 2013-12-09 18:30:50 -05:00
Aidan Brady
d36409f4b0 Merge branch 'master' into multipart-experimental-new 
Conflicts:
	common/mekanism/client/model/ModelJetpack.java
	common/mekanism/client/render/ModelCustomArmor.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemJetpack.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/induction/client/render/RenderWire.java
	common/mekanism/induction/common/tileentity/TileEntityMultimeter.java
	common/mekanism/induction/common/tileentity/TileEntityWire.java
	common/mekanism/induction/common/wire/PartUniversalConductor.java
	common/mekanism/induction/common/wire/PartWire.java
 2013-12-05 22:37:27 -05:00
Aidan Brady
c3a985f273 Kill off wires for the last time, fix up jetpacks 2013-12-05 21:10:15 -05:00
Aidan C. Brady
ef8b6c1c78 Fix gas render in mech pipe 2013-12-03 11:24:23 -05:00
Aidan Brady
a3fa18cb80 Remove superconductor, make Heat Gen cheaper 2013-12-02 22:35:46 -05:00
Aidan Brady
5d8e21b776 Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 
Conflicts:
	common/mekanism/api/gas/GasNetwork.java
	common/mekanism/api/gas/GasTransmission.java
	common/mekanism/api/transmitters/DynamicNetwork.java
	common/mekanism/client/EnergyClientUpdate.java
	common/mekanism/client/FluidClientUpdate.java
	common/mekanism/client/GasClientUpdate.java
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemConfigurator.java
	common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
	common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
	common/mekanism/common/tileentity/TileEntityPressurizedTube.java
	common/mekanism/common/tileentity/TileEntityTransmitter.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/common/util/CableUtils.java
	resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
 2013-12-02 21:45:40 -05:00
Aidan Brady
30237b34ac Delete old textures, add Copper and Tin blocks 2013-12-02 20:52:44 -05:00
Aidan C. Brady
57caab2062 Wire fixes 2013-12-02 17:04:41 -05:00
Aidan C. Brady
5c2c8e15cb Add in necessary models 2013-12-02 12:41:00 -05:00
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
c1d5e2bc60 Fixed non-multipart insulated wire texture 2013-12-01 18:05:27 +08:00