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

704 commits

Author SHA1 Message Date
Aidan Brady
cb69ff842e Fix bounds on big transmitters 2013-12-13 00:01:54 -05:00
Aidan Brady
c85bb7f9cc Add missing renderer 2013-12-12 23:36:55 -05:00
Aidan Brady
74d41073a6 Fixes, but getting an error for some reason 2013-12-12 23:08:16 -05:00
Aidan Brady
a68468b82e Fix merge 2013-12-12 22:37:14 -05:00
Aidan Brady
11c7efd8fc Merge branch 'api-change' into multipart-experimental-new 2013-12-12 22:36:00 -05:00
Aidan Brady
0e35aca15a Rendering enhancements 2013-12-12 22:31:27 -05:00
Aidan Brady
6f99805443 Fix crash 2013-12-12 22:02:34 -05:00
Aidan Brady
4316103022 Fixes 2013-12-12 21:35:17 -05:00
Ben Spiers
55dd8f5bf9 Make other transmitters work visually again, make the unicable's transparency more of a smooth exponential decay type thing and remove it's weird noop constructor 2013-12-13 01:58:25 +00:00
Aidan Brady
2d5b633168 Work on stuff 2013-12-12 20:35:37 -05:00
Aidan Brady
11aa04a5df A few charging fixes 2013-12-12 19:46:23 -05:00
Aidan Brady
9ecb7c20fd More work on Infuser 2013-12-12 19:04:02 -05:00
Aidan Brady
43d3050b40 Work on Chemical Infuser 2013-12-12 18:33:56 -05:00
Aidan C. Brady
338da4d92c Work on a more intuitive form of accepting gas in items and blocks 2013-12-12 16:54:55 -05:00
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 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
2914a4201d Fix a few bugs, work on jetpack networking 2013-12-04 15:43:03 -05: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
Aidan Brady
afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -05:00
Aidan C. Brady
54fa437cb1 A few fixes 2013-12-03 16:50:00 -05:00
Aidan C. Brady
a45a6e43f3 Fix solar generation 2013-12-03 16:23:45 -05:00
Aidan C. Brady
b60d6c172f Fix pressurized tube render 2013-12-03 16:23:08 -05:00
Aidan C. Brady
ef8b6c1c78 Fix gas render in mech pipe 2013-12-03 11:24:23 -05:00
Aidan C. Brady
7956748e8f Fix connections 2013-12-03 11:16:30 -05:00
Aidan C. Brady
a4d1b191e9 Re-add BC stuff 2013-12-03 11:10:14 -05:00
Aidan C. Brady
5e9a282eff A few fixes 2013-12-03 11:07:03 -05:00
Aidan C. Brady
9a4147ab7c Add TE and UE support to multipart cables 2013-12-03 11:03:03 -05:00
Aidan C. Brady
5dc8d2fc80 Multipart work 2013-12-03 10:54:50 -05:00
Aidan C. Brady
09b3a98a2a Work on multipart 2013-12-03 08:42:13 -05:00
Aidan Brady
934d537230 Fix a few issues 2013-12-03 07:18:40 -05:00
Aidan Brady
e848849ed8 Revert "Kill BuildCraft energy support once and for all, thanks to the excellent work of KingLemming." 
This reverts commit 1f2e792146.
 2013-12-03 06:57:53 -05:00
Aidan Brady
4ccd60f81d Fixed wire textures 2013-12-03 06:54:59 -05:00
Aidan Brady
360c980712 A bit of work on multipart 2013-12-02 23:44:34 -05:00
Aidan Brady
06b806e871 Add wildcard support to entire recipe system 2013-12-02 23:26:18 -05:00
Aidan Brady
47fd7799ff Fix up recipe system to accept wildcard blocks 2013-12-02 22:42:54 -05:00
Aidan Brady
a3fa18cb80 Remove superconductor, make Heat Gen cheaper 2013-12-02 22:35:46 -05:00
Aidan Brady
50b7870388 A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this. 2013-12-02 22:14:21 -05:00