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

1176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Spiers 98c8068a0f Get Mechanical Pipe rendering working a bit better. 2013-12-12 20:23:03 +00:00
Aidan C. Brady 85a2c981df Fixed Adv Solar Generator config 2013-12-12 13:56:00 -05: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
Ben Spiers c1318d998b Merge, hopefully without screwing too much up. 2013-12-12 01:56:05 +00: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 6114463852 Work on TileEntity code of Chemical Formulator 2013-12-11 19:53:12 -05:00
Aidan Brady 7a3c678d76 Work on new machines 2013-12-11 18:26:10 -05:00
Aidan Brady 123ae05dcd Cleaned up contractor code 2013-12-11 18:10:01 -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
Aidan Brady add3cf0bf6 Bug fixes! 2013-12-09 17:54:59 -05:00
Aidan Brady ac31fc2b4e More work on networking system, unstable 2013-12-09 17:34:53 -05:00
Aidan Brady 26f0f83574 Work on initial data system for jetpacks/gasmasks 2013-12-09 17:08:47 -05:00
Aidan Brady 44a69da8a1 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-12-09 17:00:29 -05:00
Aidan Brady 7506b8fed8 Fix particles 2013-12-09 17:00:21 -05:00
Aidan C. Brady 54a10af2d7 A few tiny fixes 2013-12-09 17:00:08 -05:00
Aidan a1e1c06bcd Merge pull request #672 from Vexatos/patch-2 
Loads of work done. (Updated de_DE.lang)
 2013-12-09 12:54:38 -08: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 C. Brady 5661b20b27 A few fixes 2013-12-09 11:56:48 -05:00
Aidan C. Brady 4035ba9b36 Add overlay for scuba tank 2013-12-09 09:52:49 -05:00
Aidan Brady 13b8c3f793 Fix MI config 2013-12-09 07:25:11 -05:00
Aidan Brady 4ebf11ed5a Fix crash 2013-12-09 07:19:16 -05:00
Aidan Brady 781aef807c Add lapis lazuli dust Enrichment Chamber recipe 2013-12-09 07:11:00 -05:00
Aidan Brady 4125ef57c6 minor changes 2013-12-08 21:40:00 -05:00
Aidan Brady 0d830d6136 Attempt a few jetpack fixes 2013-12-08 20:35:45 -05:00
Aidan Brady 8b25c1acb3 Attempt to fix a few jetpack bugs 2013-12-08 20:22:04 -05:00
Aidan Brady af1f32da8e Fix double chest crash 2013-12-08 19:22:59 -05:00
Aidan Brady d2753abc92 Fixed tiny factory sort issue 2013-12-08 16:39:03 -05:00
Aidan C. Brady ce629e218c Fix IC2 charging 2013-12-08 16:10:52 -05:00
Aidan C. Brady 8289af18fd Add configurable sound volume for all Mekanism sounds 2013-12-08 12:49:48 -05:00
Aidan Brady eb8e02a39a Fix a few bugs! 2013-12-08 12:39:26 -05:00
Aidan Brady 97bf92375a Add class enumerator for future class stuff 2013-12-08 00:43:20 -05:00
Aidan Brady 62bc5c267a Fixed weird jetpack particles 2013-12-07 23:51:07 -05:00
Aidan Brady 314f4b3082 A few rendering fixes, fixed VoiceServer hanging 2013-12-07 23:28:13 -05:00
Aidan C. Brady 5d742ce200 Teleporters are actually worth it now. 2013-12-07 23:02:25 -05:00
Aidan Brady c2737ff064 Work on things, may be unstable 2013-12-07 17:06:11 -05:00
Aidan Brady 5e50e920a6 Add potion resistance to gas mask 2013-12-07 00:55:35 -05:00
Aidan Brady 916859c21d Added description text to machines 2013-12-06 20:03:25 -05:00
Aidan C. Brady 84ab705170 Start work on new description system, UNSTABLE BUILD 2013-12-06 16:44:08 -05:00
Aidan C. Brady cb9900bbc7 Work on gas masks/scuba gear stuff 2013-12-06 15:26:44 -05:00
Aidan C. Brady f982eb851c Remove now-unused generics 2013-12-06 07:57:26 -05:00
Aidan Brady ecfe9a43b9 Fixes! 2013-12-06 07:26:48 -05:00
Aidan Brady c282965fee Complete merge 2013-12-05 22:39:54 -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 449822fef2 Fixed build 2013-12-05 22:33:28 -05:00