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

35 commits

Author SHA1 Message Date
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 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 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
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
Ben Spiers 132306ed76 Multipart and everything 2013-10-03 00:10:20 +01:00
Aidan Brady cfc5dff445 First 1.6 push, still work to be done 2013-07-20 12:10:14 -04:00