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

1145 commits

Author SHA1 Message Date
Aidan C. Brady
58f44cd3b3 Slightly cheaper unicable tiers 2014-01-28 20:15:01 -05:00
Aidan C. Brady
c4e679280b Chemical Crystalizer base tile code 2014-01-28 19:29:29 -05:00
Aidan C. Brady
6a18c338cd Finished Chemical Dissolution Chamber tile code 2014-01-28 18:47:06 -05:00
Aidan C. Brady
03fa654ddf Start on Chemical Dissolution Chamber base code 2014-01-28 16:49:49 -05:00
Aidan C. Brady
72e10a8162 Just about finished base Chemical Washer code 2014-01-28 16:19:07 -05:00
Aidan C. Brady
90328958bb Finished recipe system for new machines. 2014-01-28 15:51:30 -05:00
Aidan C. Brady
b0fbaba62b Start work on recipe systems 2014-01-26 17:55:49 -05:00
Aidan C. Brady
b180f4e968 Started on new machines 2014-01-26 17:12:03 -05:00
Aidan Brady
b51e4dfd9f Fix a small BC bug 2014-01-26 13:53:22 -05:00
Aidan C. Brady
ac008506e7 Balloons can be popped by arrows/etc, touched up Robit GUI bleeding text 2014-01-26 02:01:44 -05:00
Aidan Brady
c1aadd2bd0 NEI localization stuff 2014-01-25 16:29:36 -05:00
Mierzen
4ac0244b25 Fix typo 2014-01-25 18:35:30 +02:00
Aidan C. Brady
ba62cc5cb1 Fix that sound issue 2014-01-23 17:06:33 -05:00
Aidan C. Brady
7537d53027 Fix JABBA dupe bug 2014-01-23 16:58:52 -05:00
Aidan C. Brady
eca663a3a3 Added missing macerator recipes 2014-01-23 14:47:55 -05:00
Aidan C. Brady
a2c392f03d Fixed dumb cardboard boxes 2014-01-22 14:37:25 -05:00
Aidan C. Brady
e11a79b3c3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-22 07:43:34 -05:00
Aidan C. Brady
a001abda66 Fix Cardboard Box recipe 2014-01-22 07:43:28 -05:00
Aidan Brady
56943c8e2b Fix transmitter issue 2014-01-21 21:05:27 -05:00
Aidan C. Brady
0a0e329223 Ore gasses! For use in T4 (5x) ore processing. 2014-01-21 17:58:00 -05:00
Aidan C. Brady
7c5fe23833 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-21 11:28:49 -05:00
Aidan C. Brady
6f723f64bd Crystals! Currently useless. 2014-01-21 11:28:43 -05:00
Aidan Brady
1ca4aa6fcd Factories now accept proper gasses 2014-01-20 16:35:42 -05:00
Aidan C. Brady
52aa704a74 Add in textures for some future stuff 2014-01-19 20:32:16 -05:00
Aidan C. Brady
ad38b6f52b Minor fix 2014-01-18 15:31:00 -05:00
Aidan C. Brady
93b7321dea T3 ore processing now uses Hydrogen Chloride 2014-01-18 15:10:17 -05:00
Aidan C. Brady
8c05c53b40 A few recipe enhancements 2014-01-18 14:04:51 -05:00
Aidan C. Brady
740f4581b0 Fix NEI support to dynamically accept different gas types 2014-01-18 12:16:14 -05:00
Aidan Brady
ee2b81c3fd Fix up Clay Block recipe 2014-01-18 12:08:11 -05:00
Aidan C. Brady
31fbf5ee14 Added clay recipe, thanks @VapourDrive! 2014-01-18 11:41:41 -05:00
Aidan C. Brady
769a8a8e0c Work on things! 2014-01-18 11:26:24 -05:00
Aidan Brady
a4017fcc0e Work on things! 2014-01-18 02:31:36 -05:00
Aidan Brady
6eb72a7e44 Whoops! Fixed crash… 2014-01-18 00:50:56 -05:00
Aidan Brady
f5c607bef0 Fix up blacklist for cardboard boxes! 2014-01-18 00:45:27 -05:00
Aidan C. Brady
705352e7c4 Finish NEI support for Advanced Machines (I think) 2014-01-18 00:28:42 -05:00
Aidan C. Brady
7db4a114f6 Fixes 2014-01-17 21:29:39 -05:00
Aidan C. Brady
0314b11edb Hopefully fix some things 2014-01-17 20:38:05 -05:00
Aidan C. Brady
74a64b3373 pulpWood for sawdust 2014-01-17 18:07:29 -05:00
Aidan C. Brady
9b7abb8d96 Added null check 2014-01-17 11:18:04 -05:00
Aidan C. Brady
61306fd664 More work on things 2014-01-17 09:17:38 -05:00
Aidan C. Brady
95a3084897 Work on basic block multi-id-meta stuff 2014-01-17 07:33:34 -05:00
Aidan C. Brady
af1ab186d9 Finish Salination Controller rendering, start work on a separate Salination Controller block. 
..this means a lot of extra work to get multiple-id-meta-handling working with BasicBlocks.
 2014-01-16 22:49:48 -05:00
Aidan C. Brady
0f06146292 You think sleep can stop me? HA! 
...work on rendering.
 2014-01-16 22:12:51 -05:00
Aidan Brady
41b2d1c2bb Start on Salination Plant fancy render 2014-01-16 21:55:29 -05:00
Aidan Brady
44ae2e8606 Added null check for Vaygrim 2014-01-16 21:41:14 -05:00
Aidan Brady
fedb728709 Oops! 2014-01-16 21:36:32 -05:00
Aidan Brady
db029274f7 Fix up GUIs 2014-01-16 21:31:30 -05:00
Aidan Brady
175f3e8646 Got GUIs working with new fanciness 2014-01-16 21:26:40 -05:00
Aidan Brady
9acc264726 A few fixes 2014-01-16 20:50:59 -05:00
Aidan Brady
da6c0a2c90 Finish base code for gas-based advanced machinery 2014-01-16 20:35:05 -05:00
Aidan Brady
4fb335b7d3 Lay down framework for gas-based advanced machines 2014-01-16 19:00:53 -05:00
Aidan Brady
1de691be1d Fix stacking of brine buckets 2014-01-16 16:49:19 -05:00
Aidan Brady
6d366c0475 Brine Buckets! 2014-01-16 16:47:35 -05:00
Aidan Brady
4d29a57a27 A few fixes, new textures 2014-01-16 16:31:05 -05:00
Aidan C. Brady
3e6a017979 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-16 16:04:18 -05:00
Aidan C. Brady
d3ae5be20b Work on things! 2014-01-16 16:03:05 -05:00
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