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

372 commits

Author SHA1 Message Date
Aidan Brady
bbbd5dea73 Fix some rendering bugs 2013-12-21 01:31:52 -05:00
Aidan Brady
d3661b3cd8 Got colors working, need to fix connections 2013-12-20 21:05:44 -05:00
Aidan Brady
7bb6b2761b Base code done, onto actual implementation 2013-12-20 18:29:22 -05:00
Aidan Brady
2fcbbcfa6a Loads of work on transporters 2013-12-20 18:14:31 -05: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 C. Brady
0ab803feeb Rename Object3D to Coord4D, work on balloons 2013-12-20 16:09:09 -05:00
Aidan Brady
48af6f8fcc Balloons :) 2013-12-20 13:27:54 -05:00
Aidan Brady
510debc0fb Kill induction module and start on balloons :) 2013-12-20 01:05:41 -05:00
Aidan Brady
fbed46c0d9 More fixes 2013-12-19 16:55:41 -05:00
Aidan Brady
c5269cc1ab Fix a few crashes, begin actual side-based implementation 2013-12-18 16:09:30 -05:00
Aidan C. Brady
4964c1689f Tiny cleanup 2013-12-18 12:39:37 -05:00
Aidan C. Brady
854c909c4c Merge branch 'master' into development 2013-12-18 12:07:52 -05:00
Aidan C. Brady
65c201d829 Add try/catch to prevent OreDict iteration GUI render crash 2013-12-18 12:05:09 -05:00
Aidan C. Brady
5372bc66d6 More intelligent client-side scales 2013-12-18 11:19:30 -05:00
Aidan C. Brady
4f5c26b0d2 Fixed a bunch of bugs - think that Pressurized Tubes and Mechanical Pipes are done for the most part 2013-12-17 20:28:25 -05:00
Aidan C. Brady
cf0ad408dd Work on Mechanical Pipes 2013-12-17 18:20:18 -05:00
Aidan C. Brady
a601def4f6 More rendering; for some reason mech pipes are screwing up cache load 2013-12-17 15:54:06 -05:00
Aidan C. Brady
350ad4c22e Rendering looks cool :) 2013-12-17 15:36:25 -05:00
Ben Spiers
b4b8ddf62a Clean up unused imports 2013-12-17 20:02:29 +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
Aidan C. Brady
ffd683a3f3 Fixed rendering 2013-12-17 14:39:30 -05:00
Aidan Brady
a3529a12d7 Fix a few bugs 2013-12-17 13:23:29 -05:00
Ben Spiers
3a97630f55 Add new shapes to small model. 2013-12-17 02:21:30 +00:00
Aidan C. Brady
869660d8bf Glowstone armor now glows 2013-12-16 12:21:49 -05:00
Ben Spiers
1534d1cb14 Make a start on Multipart Transporters. 2013-12-16 14:00:43 +00:00
Aidan C. Brady
c44b63fa3a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-16 07:23:39 -05:00
Aidan C. Brady
3741488322 Hopefully fix CME 2013-12-16 07:23:33 -05:00
Aidan Brady
50b98674ed Fix crashes 2013-12-15 23:01:36 -05:00
Aidan Brady
2404e7416a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2013-12-15 19:08:16 -05:00
Aidan Brady
8b0d18e469 Tiny cleanup 2013-12-15 19:08:13 -05:00
Aidan C. Brady
37a1a0ab40 Jetpack and gas mask practically done :) 2013-12-15 18:54:43 -05: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
Aidan Brady
a6887eb813 Fixed tank crash 2013-12-15 00:43:47 -05:00
Aidan Brady
907bd10b0f Merge branch 'master' into development 2013-12-14 22:50:48 -05:00
Aidan Brady
c73259f092 Killed off old TE API, moved PipeUtils to proper loc 2013-12-14 22:50:37 -05:00
Aidan C. Brady
1e1eabfd5e Even more localization, fixed a few tiny bugs 2013-12-14 15:13:12 -05:00
Aidan Brady
0a0f3a1779 Minor cleanup 2013-12-13 07:02:13 -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
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
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
9ecb7c20fd More work on Infuser 2013-12-12 19:04:02 -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 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
5a241ce8ee Work on GUIs 2013-12-11 20:24:37 -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
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
4ebf11ed5a Fix crash 2013-12-09 07:19:16 -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 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
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 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 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
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
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
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
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
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
afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -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
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
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
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
dc8a00a140 Fix a few issues 2013-12-02 21:37:11 -05:00
Aidan Brady
75cccf96a8 Slightly speed up Digital Miner 2013-12-02 18:54:21 -05:00
Aidan C. Brady
57caab2062 Wire fixes 2013-12-02 17:04:41 -05:00
Aidan C. Brady
4a499d6dac Fix tank rendering, make Configurator serve as a BuildCraft wrench 2013-12-02 07:55:14 -05:00