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 |
|
Aidan Brady
|
9c0358b38e
|
Removed multimeter
|
2013-12-05 22:03:36 -05:00 |
|
Aidan Brady
|
c3a985f273
|
Kill off wires for the last time, fix up jetpacks
|
2013-12-05 21:10:15 -05:00 |
|
Aidan Brady
|
fb350e43f0
|
Cool stuff!
|
2013-12-05 16:42:00 -05:00 |
|
Aidan C. Brady
|
a204df448f
|
Work on jetpacks
|
2013-12-05 15:50:38 -05:00 |
|
Aidan Brady
|
73c41f7863
|
Sorters can now directly eject into inventories
|
2013-12-04 22:17:56 -05:00 |
|
Aidan Brady
|
b84445c9ea
|
Smarter Logistical Transporter future insert calculation
|
2013-12-04 22:04:51 -05:00 |
|
Aidan Brady
|
6cc198cf0b
|
Bins are nice to hoppers now.
|
2013-12-04 21:55:56 -05:00 |
|
Aidan Brady
|
38dda1d18e
|
Fix name, add a few more particle effects
|
2013-12-04 20:01:27 -05:00 |
|
Aidan Brady
|
64f681c263
|
Jetpack work!
|
2013-12-04 19:14:27 -05:00 |
|
Aidan Brady
|
aca0692cec
|
Fix a few jetpack things
|
2013-12-04 17:22:00 -05:00 |
|
Aidan Brady
|
bf9d48d86f
|
Work on jetpacks - specifically networking fixes and sounds!
|
2013-12-04 16:53:58 -05:00 |
|
Aidan C. Brady
|
aadd4fb741
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-12-04 15:43:16 -05:00 |
|
Aidan C. Brady
|
2914a4201d
|
Fix a few bugs, work on jetpack networking
|
2013-12-04 15:43:03 -05:00 |
|
Aidan
|
4ffee46861
|
Merge pull request #623 from Vexatos/patch-2
Updated de_DE.lang
|
2013-12-04 09:45:26 -08:00 |
|
Vexatos
|
538fdbcce4
|
Couldn't you have done this yourself? Nevermind...
|
2013-12-04 15:31:31 +01:00 |
|
Aidan Brady
|
91eafd02aa
|
Fixed IC2 tiers
|
2013-12-04 07:19:43 -05:00 |
|
Aidan Brady
|
82f7b0f761
|
Work on jetpack
|
2013-12-04 07:16:28 -05:00 |
|
Aidan Brady
|
7182d07cbd
|
Bugfixes and the beginnings of jetpacks!
|
2013-12-03 23:36:06 -05:00 |
|
Aidan Brady
|
a228c659cd
|
Remove RecipeLoader
|
2013-12-03 21:57:03 -05:00 |
|
Aidan Brady
|
1cfdd805f3
|
Work on jetpack
|
2013-12-03 21:49:12 -05:00 |
|
Aidan Brady
|
e9b18c1a35
|
Cleanup
|
2013-12-03 18:00:06 -05:00 |
|
Aidan Brady
|
8f4ac31871
|
Minor cleanup
|
2013-12-03 17:46:48 -05:00 |
|
Aidan Brady
|
f492ff7ee9
|
Hopefully fixed ENet crash with IC2
|
2013-12-03 16:57:57 -05:00 |
|