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

503 commits

Author SHA1 Message Date
Aidan C. Brady
d3f4934daa Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-11 22:19:58 -05:00
Aidan C. Brady
282c6fc07a Fixed that crash 2014-01-11 22:19:51 -05:00
Ben Spiers
6fa8cebb3a Make a start on the Salination plant. Primitive so far but the multiblock system just about works. 2014-01-11 23:35:39 +00:00
Aidan Brady
70d3140296 Config property for displaying different energy units 2014-01-11 11:49:27 -05:00
Aidan Brady
1df6fc689a Unless we set up an access transformer, this is necessary on my end 2014-01-10 23:26:48 -05:00
Ben Spiers
f87c27aeee Make the standard power bar a GuiElement. I think it might be good to move towards a more modular gui system. Have more stuff done in code and less in graphics. 2014-01-11 02:50:02 +00:00
Aidan C. Brady
0b98b085d3 Add fancy energy info tabs, fix a few things, bump up both energy usage and generation on some machines/generators 2014-01-10 17:42:53 -05:00
Aidan Brady
34cda86ec8 Start work on something :) 2014-01-10 16:54:26 -05:00
Aidan C. Brady
836dd3c22a Electrolytic Separator NEI plugin 2014-01-10 12:58:05 -05:00
Aidan C. Brady
6eb43d11d7 Just about finished Rotary Condensentrator NEI support 2014-01-10 08:12:47 -05:00
Aidan Brady
dac7fd44f9 Work on Rotary Condensentrator recipe handler 2014-01-09 22:09:48 -05:00
Aidan Brady
c61db44bf4 Going to use Sulfuric Acid/Sulfur in the Chemical Injection Chamber until we get Salt/Brine/etc down 2014-01-09 21:46:22 -05:00
Aidan Brady
531bfe85ee Add base class for Rotary Condensentrator NEI plugin as well 2014-01-09 20:52:19 -05:00
Aidan Brady
f7eb278276 Chemical Infuser recipe handler! 2014-01-09 20:47:06 -05:00
Aidan C. Brady
723be4cdee NEI gas lookups for usage and crafting working! 2014-01-09 19:25:44 -05:00
Aidan Brady
40684e2bab Start work on Electrolytic Separator and Chemical Oxidizer recipe handlers. Also start work on gas/fluid NEI lookups! 2014-01-09 19:11:40 -05:00
Aidan Brady
973dd92931 Remove println, add progress action 2014-01-09 18:53:47 -05:00
Aidan Brady
df2ea3155a Updated GUI textures to fix copy alpha screw up 2014-01-09 18:47:38 -05:00
Aidan C. Brady
47e24b8575 Added in a recipe handler for the Chemical Oxidizer 2014-01-09 18:06:44 -05:00
Aidan Brady
1151084209 Fixed a crash 2014-01-09 08:40:20 -05:00
Aidan Brady
2644fed4f8 A few corner cases in GUI checks, closes #795 2014-01-08 19:51:05 -05:00
Aidan C. Brady
738292bbce For some reason yPos isn't centered. I don't know why. 2014-01-08 15:23:15 -05:00
Aidan C. Brady
2600f8fe81 Balloons are cool :) 2014-01-08 14:56:54 -05:00
Aidan C. Brady
4395f3aa10 You can now place balloons on entities. Still a bit buggy, and they don't float or anything, but it works. 2014-01-07 23:39:39 -05:00
Ben Spiers
a05afb68e9 Mechanical Pipe rendering adjustments. Couldn't be bothered to make 100 different models in blender. Maybe I'll write a python script to do it for me. Might make a bigger version of the shaped in/out model to better fit the mechanical pipe. 2014-01-08 02:08:41 +00:00
Aidan Brady
4ab61c856f Organized some classes, began work on balloon entity connections 2014-01-07 20:55:50 -05:00
Aidan C. Brady
45eef1465e Fix a missed println 2014-01-07 16:18:17 -05:00
Ben Spiers
333afdc79b Remove the old transmitter renderer, enable the new one to render in hand and inventory 2014-01-07 16:22:59 +00:00
Ben Spiers
b299ad436d Rendering fixes and improvements 2014-01-06 21:49:39 +00:00
Ben Spiers
0193659c74 Switch the injection chamber to use HCl, up the difficulty of obtaining sulphur dust to prepare for sulphuric acid's use in top-tier processing. 2014-01-05 16:22:41 +00:00
Ben Spiers
7109e84907 Gui element stuff. 2014-01-05 16:22:41 +00:00
Aidan C. Brady
7c4d0ba714 Properly register items, kill old transmitter code and converter as users will be starting from a clean world 2014-01-05 02:24:06 -05:00
Ben Spiers
33af84b110 And the Electric Chest 2014-01-05 01:50:16 +00:00
Ben Spiers
4e276f4ddd Fix tooltips being annoying with NEI's rendering of 3D blocks. 2014-01-05 01:23:25 +00:00
Aidan C. Brady
55a0e39c07 Digital Miner inverse mode 2014-01-04 11:41:09 -05:00
Aidan C. Brady
c0dba3c366 Fixed GUI issue, fixed particles 2014-01-03 00:43:55 -05:00
Aidan C. Brady
1ec410d67c Added NEI stack iteration implementation for Metallurgic infuses 2014-01-02 23:58:20 -05:00
Aidan Brady
cb0b6f4a83 New, awesome Electrolytic Separator GUI :) 2014-01-02 23:34:52 -05:00
Aidan Brady
99ca8f6624 Cleanups and fixes from the electrolytic separator update 2014-01-02 22:30:23 -05:00
Aidan Brady
7ad60f0796 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-02 21:58:23 -05:00
Aidan Brady
9acc744794 Fixed differing gas networks being able to merge, fix API issue 2014-01-02 21:58:14 -05:00
Ben Spiers
f84bc43be1 Move separator into mek core, let IDEA optimise imports. Hope I didn't screw anything up too badly. 2014-01-03 02:09:21 +00:00
Ben Spiers
87a95e0732 Add Chlorine, do more E. Separator work, including temporary lava/brine substitute. I think it's pretty much finished for now, though maybe it could do with a new model. 2014-01-03 00:28:34 +00:00
Aidan Brady
5da3b31455 Make CIC use sulfur instead of gunpowder as a backup resource, dynamic GUI title rendering to prevent escaping 2014-01-02 13:11:08 -05:00
Aidan Brady
00bbb9d5c4 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-02 13:00:15 -05:00
Aidan Brady
3990ab4f42 Have NEI plugin iterate over possible fuel stacks, register sulfur dust in oredict 2014-01-02 13:00:09 -05:00
Aidan C. Brady
ea76a68112 Fix factory GUI support with sulfuric acid 2014-01-01 19:26:20 -05:00
Aidan C. Brady
67d38fd179 Removed Chemical Combiner (hopefully all references) 2014-01-01 16:21:55 -05:00
Ben Spiers
a07ca18997 Change to Infuser for final stage of the contact process 2014-01-01 19:55:18 +00:00
Aidan Brady
692a8a0412 Finished Chemical Infuser rendering, added in recipes for new machines (including Combiner which means there may be a tiny conflict if you’ve already started on the name change @unpairedbracket) 
Also…happy new year everyone :)
 2014-01-01 00:58:58 -05:00
Aidan C. Brady
c1e40be9ad Added Chemical Infuser model, still need to add dynamic rendering (shouldn't be too hard since I already have Chemical Oxidizer framework complete 2013-12-31 22:54:39 -05:00
Ben Spiers
544d96f3bc Get most of the contact process stuff working with WIP textures and such. .langs will need updating again for new things (Chemical Combiner is a provisional name though, for the time being.) 2014-01-01 03:03:23 +00:00
Ben Spiers
571ad3944f Sulphur dioxide and sulphur trioxide 2013-12-31 22:24:46 +00:00
Aidan C. Brady
371efa9ece Fix item render 2013-12-31 16:51:02 -05:00
Aidan C. Brady
2dc6a35d16 Fix a GUI bug, fixed gas tanks not loading properly, fix a few culling issues with Chemical Oxidizer, made gas render visually in Chemical Oxidizer 2013-12-31 16:38:40 -05:00
Aidan C. Brady
a277b6e266 Fixed a few bugs and reverted name changes of Sulfuric Acid in liquid/gas form. Even though it's not scientifically correct, it fits better with the Mekanism theme and is easier to understand. 2013-12-31 15:23:04 -05:00
Aidan C. Brady
750bb2dab7 Rename Oxidation Chamber to Chemical Oxidizer and added model, will explain why below. This means a minor lang update @crafteverywhere, @VeryBigBro, @Vexatos 
Notice that all Mekanism machines that perform similar tasks have a similar ending word; for example, the Metallurgic Infuser infuses alloys into ingots, and the Chemical Infuser infuses chemicals into other chemicals. Every ore processing machine has "Chamber" as the final word, and as this is not directly linked to ore processing, it would be best to move the "Oxidation" side of the machine to the end. Furthermore, for this chemical line, I am trying to keep "Chemical" as the first word in each machine title: Chemical Infuser, Chemical Oxidizer, Chemical Injection Chamber, etc. Hope that makes sense!
 2013-12-31 15:07:09 -05:00
Ben Spiers
48b3e48ed3 Re-enable indev machines for now, change Chemical Formulator to Oxidation Chamber, introduce sulphur dust. 2013-12-30 02:59:45 +00:00
Aidan C. Brady
2241e7e7b9 A few fixes 2013-12-27 12:44:08 -05:00
Aidan C. Brady
4d64afb7d9 Made KeySync use keybinds instead of defaults 2013-12-26 12:02:17 -05:00
Aidan Brady
28a63cc9d2 More proxy fixes, chemical injection chamber sound 2013-12-24 17:17:00 -05:00
Aidan Brady
3ed2d3ce6c Fixed render crash 2013-12-24 17:14:28 -05:00
Aidan Brady
fdc94550ee Fix a few bugs 2013-12-24 16:58:14 -05:00
Aidan Brady
7a71bc7848 Better holiday stuff 2013-12-24 16:06:57 -05:00
Aidan C. Brady
d63628bebc Merge branch 'master' into development 
Conflicts:
	common/mekanism/client/ClientProxy.java
	common/mekanism/client/HolidayManager.java
	common/mekanism/client/sound/SoundHandler.java
	common/mekanism/client/sound/TileSound.java
 2013-12-24 14:44:17 -05:00
Aidan Brady
84f4eaee76 Christmas fun :) 2013-12-24 14:38:12 -05:00
Aidan Brady
fd26b9b11b Work on a little Christmas surprise 2013-12-24 13:25:31 -05:00
Aidan C. Brady
9498b01475 Finished off the Chemical Injection Chamber, just need sounds 2013-12-24 12:39:27 -05:00
Aidan C. Brady
4cf33562c6 Merge branch 'master' into development 2013-12-24 12:19:24 -05:00
Aidan C. Brady
bd1e3234ff Fixed crash 2013-12-24 11:20:22 -05:00
Aidan C. Brady
a41760affd Chemical Injection Chamber initial work 2013-12-24 00:23:30 -05:00
Aidan C. Brady
9ed16f3006 A few fixes, please update! 2013-12-23 20:23:37 -05:00
Aidan C. Brady
52319ed31e A few fixes, please update! 2013-12-23 20:23:23 -05:00
Aidan C. Brady
6df7544540 Loads of javadocs, cleaned up Gas API code, removed old induction interfaces, made configurable machines notify neighbor when configuration changes, added functionality for GasStack-based ChemicaIInputs. 2013-12-23 17:06:22 -05:00
Aidan C. Brady
b060c2c005 Fix silly upgrade GUI bug 2013-12-22 23:24:20 -05:00
Aidan C. Brady
6b420d07d2 Support for items/blocks with multiple OreDict entries 2013-12-22 18:28:49 -05:00
Aidan Brady
d4fc39274e Threaded VoiceConnection, made client connection fire with server-configured port 2013-12-22 16:49:04 -05:00
Aidan C. Brady
90985663bb Sync server configs with client 2013-12-22 01:49:55 -05:00
Aidan Brady
ced44e97fc A few fixes, dynamic distance calculating as called by ILogisticalTransporter. Off to bed, more work tomorrow! 2013-12-22 01:21:40 -05:00
Aidan Brady
87ce53f3fe Removed more UE stuff 2013-12-22 01:04:35 -05:00
Aidan Brady
6c87a8e288 Add Pos3D because vectors 2013-12-21 21:06:39 -05:00
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