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
08f0b93873
Fix Chemical Oxidizer operation issue
2013-12-31 16:42:26 -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 Brady
de93c376f6
Fix a little chunk loading issue
2013-12-28 22:09:33 -05:00
Aidan Brady
e6051ee2e5
Fixed TE bug
2013-12-28 14:16:04 -05:00
Aidan C. Brady
4210d15f1a
Fixed connections to machines
2013-12-27 22:34:05 -05:00
Aidan C. Brady
6923d89fd1
Fix BioGenerator render texture
2013-12-27 22:20:27 -05:00
Aidan C. Brady
e36e62b6be
Better client energy scales in universal cables, made Logistical Transporter pull mode take one item at a time to give L. Sorter an advantage
2013-12-27 21:50:24 -05:00
Aidan C. Brady
aca4b461b7
Transporter fixes
2013-12-27 18:21:17 -05:00
Aidan C. Brady
2241e7e7b9
A few fixes
2013-12-27 12:44:08 -05:00
Aidan C. Brady
e4521c0841
Polish transmitter recipes
2013-12-27 00:54:33 -05:00
Aidan C. Brady
cd719660ad
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2013-12-26 20:27:29 -05:00
Aidan C. Brady
65fb6208fb
A few tweaks to recipe balance
2013-12-26 20:27:21 -05:00
Ben Spiers
c1daf00154
Hopefully fix the weird compile problem in a smoother way (the generic gets erased at compile time anyway but apparently IDEA thinks it matters).
2013-12-27 01:21:55 +00:00
Ben Spiers
fa3aef17b6
Fix configurable upgrade modifiers (8.0 is because 8 is maximum number of upgrades (not 9, I was being silly before) and we want to return def*upgradeModifier^1 when fully upgraded).
2013-12-27 01:21:55 +00:00
Aidan Brady
9feaae03bb
Multipart BC support, fixed recipe
2013-12-26 19:44:11 -05:00
Aidan C. Brady
4d64afb7d9
Made KeySync use keybinds instead of defaults
2013-12-26 12:02:17 -05:00
Aidan C. Brady
c3ce0cc58d
Cleaned up multipart transmitter code a bit, fixed a chunk-related connection issue
2013-12-26 02:05:25 -05:00
Aidan C. Brady
934f136d4f
Intelligent inventory parsing to strategically find and grab OreDict-relative entries
2013-12-25 19:18:07 -05:00
Aidan C. Brady
d0d4a858e1
Fixed a small bug
2013-12-25 17:57:27 -05:00
Aidan C. Brady
047ead8d09
Added a delay to Digital Miner eject, have multipart Logistical Transporters drop contents when broken, fixed transporters insertion logic
2013-12-25 17:43:44 -05:00
Aidan C. Brady
7010f03b65
Fixed a container bug that could have been driving some people nuts
2013-12-25 00:50:23 -05:00
Aidan C. Brady
9730bc261e
Fixed IC2 weird clump things replacing Mekanism recipes
2013-12-25 00:33:08 -05:00
Aidan C. Brady
583ef4fc19
More efficient redstone control
2013-12-25 00:03:04 -05:00
Aidan C. Brady
0ee53780b6
No one sends that many packets when I'm around
2013-12-24 23:29:37 -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
de3b0cb208
Fix factory injecting support
2013-12-24 17:06:35 -05:00
Aidan Brady
fdc94550ee
Fix a few bugs
2013-12-24 16:58:14 -05:00
Aidan Brady
3cea13a272
Hopefully fix JZ’s compile bug
2013-12-24 16:41:01 -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
8323ea6415
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
2013-12-24 13:28:27 -05:00
Aidan Brady
df95a64409
Finish merge
2013-12-24 13:28:20 -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
9fbbc8381f
Separated OreDict management from Mekanism, added proper recipes for Chemical Injection Chamber
2013-12-24 11:55:40 -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
9cc243a244
Properly use IFluidBlock.drain() when draining fluid blocks
2013-12-23 23:20:53 -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
b73cf8f8ed
Remove back crafting
2013-12-22 16:03:23 -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
0f7e8eec31
A few fixes
2013-12-22 01:07:47 -05:00
Aidan Brady
87ce53f3fe
Removed more UE stuff
2013-12-22 01:04:35 -05:00
Aidan Brady
3210153f38
Add delay to bin eject, removed old transmitters from creative tab, fixed descriptions of transmitters
2013-12-22 00:53:27 -05:00
Aidan Brady
4812b432fd
A few fixes, added recipes for balloons
2013-12-22 00:42:46 -05:00
Aidan Brady
96fdb4d168
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2013-12-21 21:06:48 -05:00
Aidan Brady
6c87a8e288
Add Pos3D because vectors
2013-12-21 21:06:39 -05:00
Ben Spiers
a70ce09442
Move Multipart initialisation to fix converter registration.
2013-12-22 01:43:18 +00:00
Aidan Brady
6cf6ba2b09
Transporters can now auto-pull items from adjacent sides, fixed recalculation logic with differing side types
2013-12-21 19:54:12 -05:00
Aidan Brady
f25bc6f941
Fixed saving
2013-12-21 15:58:59 -05:00
Aidan Brady
198305ff39
Fixed transfer issue
2013-12-21 14:54:12 -05:00
Aidan Brady
d6ad61114e
Attempting to find an energy transfer issue
2013-12-21 14:27:35 -05:00
Aidan Brady
235c3f20a2
Killed off old UE references
2013-12-21 12:51:55 -05:00
Aidan Brady
32a371c40d
Fixed teleporters
2013-12-21 12:22:17 -05:00
Aidan Brady
bbbd5dea73
Fix some rendering bugs
2013-12-21 01:31:52 -05:00
Aidan Brady
f2a3923c18
Got things working
2013-12-21 01:13:09 -05:00
Aidan Brady
5c3943bd5d
More logic
2013-12-21 00:58:56 -05:00
Aidan Brady
516dfb9ffb
Bits of work on transporter logic
2013-12-21 00:32:15 -05:00
Aidan Brady
15aa17e441
Connections complete, colors now update renderer properly
2013-12-20 21:34:16 -05:00
Aidan Brady
d3661b3cd8
Got colors working, need to fix connections
2013-12-20 21:05:44 -05:00
Aidan Brady
2cf6fdc18c
Lots more work
2013-12-20 19:12:33 -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
0367e62b34
Custom particles for different colors when breaking balloon
2013-12-20 01:17:54 -05:00
Aidan Brady
510debc0fb
Kill induction module and start on balloons :)
2013-12-20 01:05:41 -05:00
Aidan Brady
6b5f8833f0
Have Logistical Transporters use interfaces instead of directly referencing classes; should make multipart support easy
2013-12-19 18:21:12 -05:00
Aidan Brady
fbed46c0d9
More fixes
2013-12-19 16:55:41 -05:00
Aidan Brady
abaef2fd6d
Work on connections
2013-12-19 16:32:00 -05:00
Aidan Brady
a57f5c4fd7
Merge branch 'master' into development
2013-12-18 19:20:54 -05:00
Aidan Brady
f7f9da8ae9
Fixed Digital Miner crash, made things efficient, fixed dupe bug
2013-12-18 18:57:15 -05:00
Aidan Brady
4cd1c8f4f7
Fix a few crashes
2013-12-18 18:39:49 -05:00
Aidan Brady
8f24e5c18f
Got connection types to save/load, NONE sides will now not connect or emit to acceptors
2013-12-18 16:23:07 -05:00
Aidan Brady
c5269cc1ab
Fix a few crashes, begin actual side-based implementation
2013-12-18 16:09:30 -05:00
Aidan Brady
4d6a2a31b1
Removed println
2013-12-18 14:36:25 -05:00
Ben Spiers
52939f763b
Large Model variants. Fluid contents rendering still needs work but that's not using an obj model. It could potentially; it would be a lot cleaner in code but would mean a *lot* of blender work.
2013-12-18 18:42:05 +00:00
Aidan C. Brady
fa10c2ecb1
Add upgrade modifier config
2013-12-18 13:19:08 -05:00
Aidan C. Brady
4964c1689f
Tiny cleanup
2013-12-18 12:39:37 -05:00
