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

184 commits

Author SHA1 Message Date
Anton e163d5e6bd Update ru_RU.lang 
some work
 2013-12-21 19:54:29 +03:00
Aidan Brady f2d202d90f Work on transporters 2013-12-20 17:46:24 -05:00
Aidan Brady 40e2d3b7fc Bump version, work on multipart transporters 2013-12-20 16:47:09 -05:00
Aidan Brady 510debc0fb Kill induction module and start on balloons :) 2013-12-20 01:05:41 -05:00
Aidan Brady 6b5f8833f0 Have Logistical Transporters use interfaces instead of directly referencing classes; should make multipart support easy 2013-12-19 18:21:12 -05:00
Ben Spiers 52939f763b Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work. 2013-12-18 18:42:05 +00:00
Ben Spiers 8199408e75 Side-specific changeable models. They don't behave differently yet but that should be possible now without too much trouble. 2013-12-17 20:02:29 +00:00
Ben Spiers 3a97630f55 Add new shapes to small model. 2013-12-17 02:21:30 +00:00
Aidan Brady d21ef524a0 Work on jetpacks/scuba stuff 2013-12-15 16:07:30 -05:00
Aidan Brady 8057d605a1 Merge branch 'master' into development 2013-12-15 14:19:57 -05:00
crafteverywhere f673244293 Update zh_CN.lang 2013-12-15 20:19:09 +08:00
Aidan Brady 345aecb4db Merge branch 'master' into development 2013-12-14 17:58:13 -05:00
Aidan C. Brady 1e1eabfd5e Even more localization, fixed a few tiny bugs 2013-12-14 15:13:12 -05:00
Vexatos fc0a611f93 Update de_DE.lang 2013-12-13 19:50:48 +01:00
Aidan Brady 11c7efd8fc Merge branch 'api-change' into multipart-experimental-new 2013-12-12 22:36:00 -05:00
Aidan Brady 2d5b633168 Work on stuff 2013-12-12 20:35:37 -05:00
Aidan Brady 43d3050b40 Work on Chemical Infuser 2013-12-12 18:33:56 -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 5a241ce8ee Work on GUIs 2013-12-11 20:24:37 -05:00
Aidan Brady 2d626f2279 Work on Chemical Infuser & Chemical Formulator recipe system 2013-12-11 17:08:15 -05:00
Aidan C. Brady 7e48fa2743 Work on container code 2013-12-11 16:34:54 -05:00
Aidan C. Brady a4e8158448 Add GUIs for T3 ore processing machinery 2013-12-10 18:51:16 -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
Vexatos 461e2886ab Typo fix. Let's hope is was a typo. 
Let's hope is was a typo.
 2013-12-09 19:23:03 +01:00
Vexatos 02fcac8967 Loads of work done. (Updated de_DE.lang) 
Yes, "Minierer" is a German word.
 2013-12-09 19:22:05 +01:00
Aidan Brady 916859c21d Added description text to machines 2013-12-06 20:03:25 -05:00
Aidan C. Brady cb9900bbc7 Work on gas masks/scuba gear stuff 2013-12-06 15:26:44 -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 a204df448f Work on jetpacks 2013-12-05 15:50:38 -05:00
Aidan Brady 38dda1d18e Fix name, add a few more particle effects 2013-12-04 20:01:27 -05:00
Aidan Brady bf9d48d86f Work on jetpacks - specifically networking fixes and sounds! 2013-12-04 16:53:58 -05:00
Vexatos 538fdbcce4 Couldn't you have done this yourself? Nevermind... 2013-12-04 15:31:31 +01:00
Aidan Brady 7182d07cbd Bugfixes and the beginnings of jetpacks! 2013-12-03 23:36:06 -05:00
Aidan Brady 1cfdd805f3 Work on jetpack 2013-12-03 21:49:12 -05:00
Aidan Brady 8f4ac31871 Minor cleanup 2013-12-03 17:46:48 -05:00
Aidan Brady afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -05:00
Aidan C. Brady ef8b6c1c78 Fix gas render in mech pipe 2013-12-03 11:24:23 -05:00
Vexatos 278b46a8dd Update de_DE.lang 2013-12-03 15:39:26 +01:00
Aidan Brady 934d537230 Fix a few issues 2013-12-03 07:18:40 -05:00
Vexatos c0b57017df Update de_DE.lang 2013-12-03 07:48:00 +01: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
Vexatos f5f9dca4ee Update de_DE.lang 2013-12-02 19:08:17 +01:00
Aidan C. Brady 5c2c8e15cb Add in necessary models 2013-12-02 12:41:00 -05:00