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

1189 commits

Author SHA1 Message Date
ruifung
4e49ec6a76 Remove redundant energy unit in cable tooltip. 
MekanismUtils.getEnergyDisplay() already returns a string with the energy unit chosen in config.
 2014-01-17 00:04:50 +08:00
Aidan C. Brady
f6bca1d2c9 Added Salination Plant component recipes, removed a few printlns, more descriptive multiblock issue notifications 2014-01-15 23:52:10 -05:00
Aidan Brady
ee0193cb3d Made that sawmill quieter 2014-01-15 23:12:48 -05:00
Aidan Brady
053b6f34f6 Salination Controller GUI handler because I’m nice 2014-01-15 23:03:40 -05:00
Aidan Brady
e83455ad2b Fix cable tooltip 2014-01-15 18:02:19 -05:00
Aidan Brady
40663d6a6a Fixed #838, thanks @Not-steve 2014-01-15 18:01:12 -05:00
Aidan Brady
9c5ee1e7f8 Fix silk not working 2014-01-15 17:52:29 -05:00
Aidan C. Brady
7d69639a8a A few bug fixes 2014-01-15 17:36:38 -05:00
Aidan C. Brady
b89349894e Fix spawner config 2014-01-15 10:43:11 -05:00
Aidan C. Brady
5e775a9c8a Fixed recipe conflict 2014-01-15 07:54:12 -05:00
Aidan C. Brady
ab58f76d6b Tooltips! 2014-01-15 07:45:55 -05:00
Aidan C. Brady
d03b2b28be Fix Gas Masks making you completely invincible 2014-01-15 07:22:50 -05:00
Aidan C. Brady
da8a1a78db Fixes! :) 2014-01-14 22:31:59 -05:00
Aidan C. Brady
fe2deb9b9b And yet more Salination Plant work! 2014-01-14 22:00:23 -05:00
Aidan C. Brady
ae5fe1cfbf Just about finished Salination Plant multiblock stuff 2014-01-14 21:29:46 -05:00
Aidan C. Brady
514225180b Don't auto-build multiblock 2014-01-14 19:50:11 -05:00
Aidan C. Brady
992b24e868 Fixes 2014-01-14 18:43:41 -05:00
Aidan C. Brady
98f3f544cd More salivation plant work 2014-01-14 18:30:26 -05:00
Aidan C. Brady
e726e5039e Work on Salination Plants 2014-01-14 16:19:21 -05:00
Aidan C. Brady
7ed788cab4 Finalized Salination Controller algo 2014-01-14 11:38:53 -05:00
Aidan C. Brady
56db9737f6 Work on multiblock algorithm 2014-01-14 11:28:09 -05:00
Aidan C. Brady
804d071643 More work on salivation controllers 2014-01-14 00:17:15 -05:00
Aidan C. Brady
83ee208fb7 Added a few cool textures, neatened up Salination Tank structure code 2014-01-13 23:53:56 -05:00
Aidan Brady
fb140d4318 Fix silly recipe bug 2014-01-13 22:33:25 -05:00
Aidan Brady
71cfd3cd84 Better textures, sounds for Chemical Infuser, Chemical Oxidizer & Precision Sawmill, sounds now fade in 2014-01-13 22:27:47 -05:00
Aidan Brady
8f6b618328 Work on recipes, fixed a few bugs 2014-01-13 21:43:36 -05:00
Aidan Brady
0aafa16106 Fix a few things, start on recipes 2014-01-13 18:37:54 -05:00
Aidan Brady
398dffb7ce Added config option to disable Cardboard Boxes picking up spawners 2014-01-13 16:37:15 -05:00
Aidan C. Brady
4d9c2ad2b2 Fixed Gas Mask location 2014-01-13 15:49:32 -05:00
Aidan C. Brady
b82f96d19b Fixed a few textures, added Salt, added NEI recipe handler for Precision Sawmill 2014-01-13 15:41:23 -05:00
Aidan C. Brady
301691729f Fixed Cardboard side texture 2014-01-13 15:05:26 -05:00
Aidan C. Brady
dd8e77d918 Precision Sawmill textures 2014-01-13 12:22:23 -05:00
Aidan C. Brady
5dfee9ec7a Precision Sawmill and overall Chance Machine framework GUI & Container 2014-01-13 00:06:13 -05:00
Aidan C. Brady
19b36e901b Work on Precision Sawmill, added Sawdust, finished ChanceMachine tile and recipe foundation 2014-01-12 23:55:42 -05:00
Aidan Brady
763c5decb1 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-12 22:47:14 -05:00
Aidan Brady
5ffd5534da Start on to-be-named log processor 2014-01-12 22:47:08 -05:00
Aidan C. Brady
ebdbdbefe3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-12 21:23:41 -05:00
Aidan C. Brady
89a70f4444 Cardboard Boxes. Yep :) 2014-01-12 21:23:34 -05:00
Ben Spiers
2717f6fd4a Redstone sensitivity on transmitters. 2014-01-12 21:27:45 +00:00
Aidan Brady
f59e12d9cf Fix Atomic Disassembler vein issue 2014-01-12 12:14:15 -05:00
Aidan Brady
9eef8c43b6 Allow for SMP-side mc dir access 2014-01-12 11:46:25 -05:00
Aidan C. Brady
16219e501e Fix a few debug codes 2014-01-11 22:24:15 -05:00
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
a1cc44bb90 Iteration #2 of salination plants, they have a more defined shape now but the algorithm seems very costly so it only does it when configurated. Still work to do. 2014-01-12 03:05:53 +00: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
7b5b5b3482 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-11 11:49:34 -05:00
Aidan Brady
70d3140296 Config property for displaying different energy units 2014-01-11 11:49:27 -05:00
Aidan C. Brady
9aef5beed3 Bump version to 5.7.0 due to Vaygrim's request, closes #808 2014-01-11 11:00:55 -05:00
Aidan C. Brady
88d7653aa1 Added some more blocks to Digital Miner blacklist. 2014-01-11 10:56:59 -05:00
Aidan Brady
a3012b05fb Fixed vein Redstone Ore support 2014-01-11 00:16:31 -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
ce7fbaaeb0 Remove a loop in the solar generator code that was causing a big performance hit. As far as I can tell all it did was disable it if there were other solars above. By all means put it back if it was more important than that. 2014-01-11 02:53:09 +00: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 Brady
73f0c646c8 Quick cleanup 2014-01-10 16:35:29 -05:00
Aidan Brady
210e949ed4 Slow, med and fast rates for Atomic Disassembler 2014-01-10 16:32:00 -05:00
Ben Spiers
ea7a421d7b Backport CableUtils optimisations to master branch 2014-01-10 21:27:51 +00:00
Ben Spiers
b49d067f0c Some hopeful performance improvements to getConnections() and emit() 2014-01-10 20:33:19 +00:00
Aidan C. Brady
6728abde06 Added vein mining to Atomic Disassembler, bumped energy usage 2014-01-10 13:52:30 -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 C. Brady
d21415fcae Fixed smelting recipes 2014-01-09 14:45:06 -05:00
Aidan C. Brady
a5185273ce Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-09 14:30:36 -05:00
Aidan C. Brady
ec9a77d31f Fixed bedrock issue, transmitters can now be wrenched by IC2 wrenches 2014-01-09 14:30:30 -05:00
Aidan Brady
e113af9dd1 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-09 08:40:27 -05:00
Aidan Brady
1151084209 Fixed a crash 2014-01-09 08:40:20 -05:00
Aidan C. Brady
8886b4caaa Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-08 22:26:08 -05:00
Aidan C. Brady
3a37ac7d99 Added in some most likely temporary recipes for new UniCable tiers 2014-01-08 22:26:01 -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
f0e5c7c468 General cleanup 2014-01-08 18:28:17 -05:00
Aidan C. Brady
88da994a27 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-08 15:23:24 -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
Ben Spiers
849273f004 Try and fix a strange crash that can't happen but is happening anyway. 2014-01-08 20:17:08 +00:00
Aidan C. Brady
2600f8fe81 Balloons are cool :) 2014-01-08 14:56:54 -05:00
Aidan Brady
54b4e75bc2 Start work on balloon entity base raytrace 2014-01-08 07:31:17 -05:00
Aidan C. Brady
ddae9ed34b Fixed bug with balloons moving with entities 2014-01-07 23:55:17 -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
ca207eb502 Recipe fixes 2014-01-08 02:08:42 +00: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
Aidan C. Brady
dc52ca5d43 Updated Donator list, thanks for paying off this month's server fees Nephatrine :) 2014-01-07 14:19:49 -05:00
Ben Spiers
0d4c018435 Fix a transporter thing. 2014-01-07 16:23:14 +00: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
ac07e54a1c Separate the current buffer from the throughput when examining a network 2014-01-07 03:17:59 +00:00
Ben Spiers
d0f64ebc11 Tiered UniCables. Pending recipes and capacity balance. Other limitations may be imposed on low-tier cables if we think of any. 2014-01-07 02:48:57 +00:00
Ben Spiers
b299ad436d Rendering fixes and improvements 2014-01-06 21:49:39 +00:00
Aidan C. Brady
1129a33bf6 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-05 16:28:11 -05:00
Aidan C. Brady
a9143ee318 Added Electrolytic Separator recipes to RecipeHelper API 2014-01-05 16:27:56 -05:00
Ben Spiers
ab26ba5b73 More avoidance of crashing due to separator changes. 2014-01-05 20:22:06 +00:00
Aidan Brady
30055fc3ed Fixed Balloons screwing up (again) 2014-01-05 15:06:54 -05:00
Ben Spiers
4b1adf76bc Stop FML complaining about item conflicts, fix my translation. 2014-01-05 17:53:10 +00:00
Aidan C. Brady
be96cb62ce Fixed Bounding Blocks causing crashes 2014-01-05 12:10:05 -05:00
Aidan C. Brady
1e6cc0916f Fix balloons flying away after chunk unload 2014-01-05 12:04:22 -05: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
Aidan C. Brady
7b5dd5c339 Remove println, we're golden guys :) 2014-01-05 00:52:23 -05:00
Aidan C. Brady
dce4c918f4 Fix? 2014-01-05 00:29:35 -05:00
Aidan C. Brady
f2b4849844 Hopefully get a load plugin working 2014-01-05 00:28:20 -05:00
Ben Spiers
33af84b110 And the Electric Chest 2014-01-05 01:50:16 +00:00
Ben Spiers
6dd01ead8c Nerf speed upgrades like I said I was going to and then forgot. 2014-01-05 01:24:04 +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 Brady
05bbcd4a48 Attempt to remove MekanismAll, I really have no idea what I’m doing though 
Also kill copied ItemMultiPart
 2014-01-04 18:50:13 -05:00
Aidan Brady
ce6321affd Remove @Override, thanks @Kobata 2014-01-04 18:35:55 -05:00
Aidan Brady
3ed6584ca7 Fix, perhaps? 2014-01-04 18:34:24 -05:00
Aidan Brady
de06b70ca0 Launch, not laumch 2014-01-04 18:23:48 -05:00
Aidan Brady
a155754c89 Pull my own version of MItemMultiPart 2014-01-04 15:15:47 -05:00
Aidan Brady
537e599710 DepLoader, hope this works 2014-01-04 14:57:44 -05:00
Aidan Brady
e3b3f89c37 Remove failed fix attempt 2014-01-04 13:46:15 -05:00
Aidan Brady
4f68913eba Maybe fix build? Also temporarily adding FMP lib 2014-01-04 13:16:24 -05:00
Aidan C. Brady
55a0e39c07 Digital Miner inverse mode 2014-01-04 11:41:09 -05:00
Aidan C. Brady
c824aea5d4 Start work on inverse DM filter system 2014-01-04 01:41:43 -05:00
Aidan Brady
5a3595778a Update ItemAttacher to work with new transmitters 2014-01-03 17:19:02 -05:00
Aidan Brady
1835f6ff91 Update TE, add module config syncing 2014-01-03 14:26:41 -05:00
Aidan Brady
a4f6690ee9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-03 12:13:55 -05:00
Aidan Brady
8118e96efb Fix weird connection issue 2014-01-03 12:13:49 -05:00
Aidan C. Brady
187403e72c Fixed a factory transfer issue 2014-01-03 10:07:35 -05:00
Aidan C. Brady
b538565846 Removed println, fixed possible crash 2014-01-03 08:34:56 -05:00
Aidan C. Brady
c0dba3c366 Fixed GUI issue, fixed particles 2014-01-03 00:43:55 -05:00
Aidan C. Brady
eb6db2dda1 Fix Electrolytic Separator crash 2014-01-03 00:03:28 -05:00
Aidan C. Brady
5e8dcd6c7d Fix crash due to java being bad 2014-01-03 00:01:53 -05:00
Aidan C. Brady
1ec410d67c Added NEI stack iteration implementation for Metallurgic infuses 2014-01-02 23:58:20 -05:00
Aidan Brady
2cf27c698d Added Compressed Redstone as an efficient means of obtaining redstone infuse 2014-01-02 23:46:23 -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
26f8aef381 Add check for old separators, add colorblind support to Logistical Transporter 2014-01-02 22:11:40 -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
a50efa8cf5 Make ComputerCraft modems placeable on energy cubes again. I think it broke when the nice model was added. 2014-01-03 00:28:34 +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
Ben Spiers
ea96a7d747 Start work on updating the electrolytic separator. It can output both gases now! Should support recipes as well. 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
a5e62bf7a9 Fixed factory connection issue 2014-01-01 20:02:10 -05:00
Aidan C. Brady
ea76a68112 Fix factory GUI support with sulfuric acid 2014-01-01 19:26:20 -05:00
Aidan C. Brady
c72f04b61b Fixed factory gas management bug 2014-01-01 19:07:14 -05:00
Ben Spiers
0385123a46 Unfudge that merge. 2014-01-01 23:35:13 +00:00
Ben Spiers
7236638d59 Clean up supportsUpgrades a bit 2014-01-01 23:13:04 +00: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
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
0b861f71af TEMP FIX for Wylker, will be rolled back for matured changes in v6 2013-12-28 22:17:05 -05: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 Brady
1573474654 Update BC & IC2 APIs 2013-12-26 15:00:08 -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