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

1035 commits

Author SHA1 Message Date
Aidan C. Brady
72026dd1c5 Lasers now dynamically damage entities based on energy output 2015-03-21 11:31:51 -05:00
Aidan C. Brady
765b58a058 Fixed a transition crash 2015-03-21 11:11:24 -05:00
Aidan C. Brady
a31449c2d3 Fixed the crafting issue - it was fairly silly, actually 2015-03-21 00:50:19 -05:00
Aidan C. Brady
3305581373 Fixed Precision Sawmill not applying secondary outputs 2015-03-20 23:16:48 -05:00
Aidan C. Brady
84759daacd Fixed Metallurgic Infuser not switching to inactive state 2015-03-20 23:04:33 -05:00
Aidan C. Brady
81b5724c53 Self-merged Chemical Infuser fix 2015-03-20 22:54:48 -05:00
Aidan C. Brady
39621a74b1 Added config to display profiled portable tanks 2015-03-20 22:46:26 -05:00
David Vierra
30684d6aef Fix Metallurgic Infuser not auto-ejecting output 
Fixes #2268

(it was trying to auto-eject energy cells :P)

I checked all of the other TileComponentEjector instances for similar errors, the rest of them look okay.
 2015-03-20 14:16:23 -10:00
Aidan C. Brady
82c355cb86 Added a null check for transitions 2015-03-20 17:37:22 -05:00
Aidan C. Brady
37bc6a07c0 Flamethrowers now use gas 2015-03-20 17:34:11 -05:00
Aidan C. Brady
8173af50e0 Bump version to 8.0.1 - preparing to fix some bugs 2015-03-20 15:28:20 -04:00
Aidan C. Brady
e92f2654de API finalization, all set for release. 2015-03-20 14:18:18 -04:00
Aidan C. Brady
5206c6106e Use HTTPS for donator list download 2015-03-20 14:03:02 -04:00
Aidan C. Brady
2664e2e04c Perfected flamethrowers in SMP 2015-03-20 13:13:24 -04:00
Aidan C. Brady
5a35d54a5c Flamethrower networking fixes 2015-03-20 13:06:19 -04:00
Aidan C. Brady
caab819663 Fixed Fluid Gauge crash 2015-03-20 12:15:07 -04:00
Aidan C. Brady
6d85b0800f Fixed a Metallurgic Infuser container bug, hopefully fixed flamethrowers on SMP 2015-03-20 01:39:22 -04:00
Aidan C. Brady
8d83ada60f Fixed a Laser Amplifier & Laser Tractor Beam inventory crash, fixed missing sounds for Chargepad, Chemical Crystallzer, Chemical Washer & Metallurgic Infuser 2015-03-20 01:30:11 -04:00
Aidan C. Brady
c3ef938166 Implemented the SoundWrapper system again - for some reason dedicated servers won't behave without it on OS X 2015-03-19 23:16:27 -04:00
Aidan C. Brady
6bae353118 Fixed a transition crash 2015-03-19 20:41:18 -04:00
Aidan C. Brady
6276439c51 Fixed Charcoal Blocks and Refined Flowstone screwing up 2015-03-19 20:16:21 -04:00
Aidan C. Brady
eb7865b967 Eject config now should transition between versions. 2015-03-19 20:05:37 -04:00
Aidan C. Brady
b096202137 Hopefully finish off the migration of side configuration 2015-03-19 19:31:17 -04:00
Aidan C. Brady
6bea59ab5e Upgrades should now transition between v7 and v8 2015-03-19 18:57:09 -04:00
Aidan C. Brady
061c84d586 Even better factory transition 2015-03-19 18:53:02 -04:00
Aidan C. Brady
d3df5c5ce7 Attempt a fix at factory world transition 2015-03-19 18:12:06 -04:00
Aidan C. Brady
a1929b1918 Added recipe to turn brine into salt 2015-03-19 17:44:27 -04:00
Aidan C. Brady
a6e8fc8de0 Energy usage calculations are now much more efficient 2015-03-19 17:36:43 -04:00
Aidan C. Brady
763aef4fd0 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-19 17:22:45 -04:00
Aidan C. Brady
3b96fe4a4c Fixed Digital Miner, fixed energy upgrades not affecting usage of Chemical Washers/Electrolytic Separators/Chemical Infusers/Rotary Condensentrators, added "dump excess" to electrolytic separator 2015-03-19 17:22:31 -04:00
Ben Spiers
2a3ddd014b Remove FMLRenderAccessLibrary reference 2015-03-19 16:41:07 +00:00
Ben Spiers
b69e6a9d80 Make temperatures consistent. 2015-03-19 16:41:07 +00:00
Aidan C. Brady
9c6708660b Fixed Metallurgic Infuser tooltip 2015-03-19 09:28:50 -04:00
Aidan C. Brady
b51fbe79fd Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-19 08:54:06 -04:00
Aidan C. Brady
7bfaa738e3 Fixed teleporter crash 2015-03-19 08:53:43 -04:00
Ben Spiers
d560ea91a8 Move lighting config to general. 
Hopefully fixes whatever weird issue was going on before.
 2015-03-19 12:47:36 +00:00
Aidan C. Brady
7dec274a56 Fixed server-sided light value calls 2015-03-19 07:06:21 -04:00
Ben Spiers
35b3ec365f Fix a reactor controller serverside crash 2015-03-19 00:43:07 +00:00
Ben Spiers
b817b2840c Fix Generator Tiles' client/server sidedness 2015-03-19 00:36:29 +00:00
Ben Spiers
a90680eaae Fix sounds on the client-side of factories 2015-03-19 00:16:36 +00:00
Ben Spiers
efeeb06b77 Move rendering IDs to Common Proxy classes to appease ExtraUtils. 2015-03-18 21:39:01 +00:00
Ben Spiers
e36ecf9f05 Clean up and fix some stuff from the rebase pull. 2015-03-18 21:00:11 +00:00
Ben Spiers
a21e679a1d Make Lasers better at server-side 2015-03-18 20:52:58 +00:00
Ben Spiers
0307acc7eb Fix sounds on the server side. 2015-03-18 20:52:58 +00:00
Ben Spiers
eb5e8b0cca Make the reactor use Hohlraums properly 2015-03-18 20:47:31 +00:00
Aidan C. Brady
339e048a4e After much client code isolation, there should be no more issues on the server side with sounds 2015-03-18 13:26:12 -04:00
Aidan
12b6b4610b Merge pull request #2221 from halvors/development 
Cleanup, cleared some warnings.
 2015-03-18 08:55:37 -04:00
Halvor Lyche Strandvoll
97e51e0c26 Cleanup, cleared some warnings. 2015-03-18 13:51:14 +01:00
Aidan C. Brady
cc5080d908 Cleanup 2015-03-18 07:50:17 -04:00
Aidan C. Brady
1b813b4142 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-18 07:48:59 -04:00
Aidan C. Brady
398fa5d01a Added that nullary constructor 2015-03-18 07:48:52 -04:00
Ben Spiers
4e3999ea9c Make the rendering of Induction Matrix internals a bit nicer. 2015-03-18 01:32:35 +00:00
Ben Spiers
60a32d44f6 CTM for the Induction Matrix internals. @aidancbrady, what do you think? 
Feel free to revert if you preferred it how it was.
 2015-03-18 01:10:52 +00:00
Aidan C. Brady
6502ee031b Cleaned up integration code, added minor aluminum ore processing. Adding new resources for full recipe processing is now stupid easy. 2015-03-17 20:22:15 -04:00
Ben Spiers
e9a3000e8d Add Optional removal of IToolHammer. Fixes #2216 2015-03-17 23:49:45 +00:00
Ben Spiers
01f37e552e Make induction ports work with connected textures. 2015-03-17 23:49:45 +00:00
Aidan C. Brady
ad2a354f45 Refactored Dust items, removed Obsidian ore processing (doesn't have a use considering Obsidian is just about entirely renewable) 2015-03-17 19:16:36 -04:00
Aidan C. Brady
f5d94ca1dc Perfected Portable Tank valve animation 2015-03-17 18:02:07 -04:00
Aidan C. Brady
3c39af45de Added Crescent Hammer support 2015-03-17 17:44:28 -04:00
Aidan C. Brady
6847a1e9ee Minor cleanup 2015-03-17 17:36:32 -04:00
Aidan C. Brady
1f28a9bfbf Transporters now have deeply integrated support for bins, including prediction algorithms 2015-03-17 17:30:40 -04:00
Aidan C. Brady
a5a9ab9daf Merge branch 'master' into development 2015-03-17 17:27:17 -04:00
Aidan C. Brady
088cd2f4d3 A few bin fixes 2015-03-17 17:26:59 -04:00
Aidan C. Brady
2749adcc06 Made sure transporters check strict inventory stack limits, fixed the AE2 interaction 2015-03-17 15:30:40 -04:00
Aidan C. Brady
c991e12bea Removed test recipe. IMC is done! 2015-03-17 10:50:45 -04:00
Aidan C. Brady
bfbddd3c47 Standardize the names of machine outputs 2015-03-17 10:29:09 -04:00
Aidan C. Brady
1071b57b7d IMC API for machines! 2015-03-17 08:43:41 -04:00
Aidan C. Brady
749c579bb3 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-16 15:05:49 -04:00
Aidan C. Brady
71420a2550 Fixed PlayerSound fade effect 2015-03-16 15:05:43 -04:00
Ben Spiers
71a9bfc4f9 Make the @Optional removals stricter. 
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
 2015-03-16 15:48:19 +00:00
Aidan C. Brady
9db789674a Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-16 11:43:41 -04:00
Aidan C. Brady
d1990c232d Finished off Oredictionificator 2015-03-16 11:43:28 -04:00
Ben Spiers
797308f587 Update Forge version. 
Account for the random inexplicable non-existence of FMLRenderAccessLibrary
 2015-03-16 15:22:19 +00:00
Aidan C. Brady
77c68b05bf Merge branch 'master' into development 2015-03-16 11:03:07 -04:00
Aidan C. Brady
02cb425cbd Work on Oredictionificator operations 2015-03-16 11:02:54 -04:00
Aidan C. Brady
d61723c5f7 Fixed a few issues - Oredictionificator filter system is done 2015-03-16 07:58:53 -04:00
Aidan C. Brady
2cd3d5d899 Work on GUI 2015-03-15 23:39:55 -04:00
brian lewis
2a1fe5b3e9 [#2210] fix for NPE on placing an empty gas-burning generator 2015-03-15 19:26:12 -05:00
Aidan C. Brady
f51c528bbf Added recipes for new v8 content 2015-03-15 17:57:15 -04:00
Aidan C. Brady
9f20e0bce0 Oredictionificator work 2015-03-13 20:37:20 -04:00
Aidan C. Brady
6870b211c5 Oredictionificator work 2015-03-13 10:20:19 -05:00
Aidan C. Brady
8a88df5f1c Start on Oredictionificator! 2015-03-13 09:14:57 -05:00
Aidan C. Brady
6e3efacffb Hide Heat Transmitter until it's finished 2015-03-12 23:48:13 -05:00
Aidan C. Brady
ca16c64de1 Fixed a crash 2015-03-12 23:37:04 -05:00
Aidan C. Brady
093d18e6fa Implemented a failsafe tick handler in FrequencyManager, fixed a small deactivation mishap 2015-03-12 23:29:11 -05:00
Aidan C. Brady
6801092113 Fixed data fetch 2015-03-12 23:17:25 -05:00
Aidan C. Brady
f9c10d9012 More work on teleporters, implemented chunkloading 2015-03-12 22:55:37 -05:00
Aidan C. Brady
9c21621c06 Just about finished! Teleporter & Portable Teleporter work with the new frequency system perfectly. 2015-03-12 17:30:40 -05:00
Aidan C. Brady
6d36926866 Work on Portable Teleporter, need to fix the screwed up GUI 2015-03-12 16:52:04 -05:00
Aidan C. Brady
9043e12938 Work on new Portable Teleporter GUI - going to basically be a clone of the regular teleporter GUI without an inventory view 2015-03-12 11:18:12 -05:00
Aidan C. Brady
d16a6f06ee Teleporting works! Tomorrow I'll try and implement the Portable Teleporter. 2015-03-12 01:32:24 -05:00
Aidan C. Brady
cefd4ba107 Fixed another NBT issue 2015-03-12 01:18:21 -05:00
Aidan C. Brady
c2c3bd14bc Many fixes - still need to get private frequencies to load 2015-03-12 01:03:31 -05:00
Aidan C. Brady
dc611eb0b2 Work on GUI, things are starting to work 2015-03-11 18:13:47 -05:00
Aidan C. Brady
76b93bec65 More teleporter work. Getting pretty complicated, hopefully I can pull this off 2015-03-11 17:42:33 -05:00
Aidan C. Brady
855a5acf1d Code cleanup 2015-03-11 15:41:13 -05:00
Aidan
c394c7c9bb Merge pull request #2186 from Archtikz/development 
Completely remade Seismic Reader.
 2015-03-11 10:59:31 -05:00
Aidan C. Brady
5e5975bc58 Work on new teleporter system - still a lot to do 2015-03-11 10:58:15 -05:00
Aidan C. Brady
605532adab Added frequency framework, should make creating frequency-based teleportation networks a breeze 2015-03-09 23:55:32 -05:00
Archtikz
1d4ff14013 Some more work on the Seismic Reader, tooltips and scaling changes 2015-03-09 22:10:15 +00:00
Aidan C. Brady
6ebf226db0 Make sure to save chunk changes 2015-03-09 15:38:18 -05:00
Aidan C. Brady
e3ca5ccecd Implemented the new systems in factories and chemical crystallizers, added better configurator mode switch tooltips 2015-03-08 18:55:56 -05:00
Aidan C. Brady
93df96851a Added remaining framework for gas/fluid tank handling, finished new configuration implementation for PRC and Chemical Injection Chamber 2015-03-08 18:24:21 -05:00
Archtikz
4f91277261 Completely remade Seismic Reader, may not be 100% efficient as it could 
be and I've bug tested as much as I can.
 2015-03-08 19:16:21 +00:00
Aidan C. Brady
18e23bb74c Better tooltips 2015-03-08 13:36:04 -05:00
Aidan C. Brady
8ce105d95f More configuration work 2015-03-08 13:27:34 -05:00
Aidan C. Brady
1f59f8ca1d Finished implementation of sided energy configuration. Yay! 2015-03-08 00:59:39 -06:00
Aidan C. Brady
e70650154d Added energy config readiness to all configurable machines, still yet to actually implement energy management 2015-03-07 23:55:22 -06:00
Aidan C. Brady
1bff3a93da Just about finished new Side Configuration GUI 2015-03-07 23:38:20 -05:00
Aidan C. Brady
28b209800a Quick fix for transporter color issue 2015-03-07 22:16:23 -05:00
Aidan C. Brady
78c3fe50ca Finished the separation of transporter and side configs 2015-03-07 22:11:10 -05:00
Aidan C. Brady
c84e13124a Work on configuration GUI 2015-03-07 21:19:59 -05:00
Aidan C. Brady
3f41027325 Started work on the new configuration interfaces, separated the transporter configuration from general side configuration, reorganized GUI elements into their own package 2015-03-07 21:08:28 -05:00
Aidan C. Brady
4085cb297d Fixed a few bugs with the new system 2015-03-07 19:22:54 -05:00
Aidan C. Brady
d4d7e88c4e Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration. 
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
 2015-03-07 19:09:23 -05:00
Aidan C. Brady
35518ad01f Fixed some tooltips, Hohlraum now properly accepts D-T fuel, added Hohlraum recipe, added lithium to EIM recipes 2015-03-06 07:50:09 -05:00
Aidan C. Brady
c1fc1c7cfb Added hohlraum, added D-T fuel recipe to Chemical Infuser, added a few missing tooltips 2015-03-05 22:53:07 -05:00
Aidan C. Brady
55ed9cd1f1 Fixed machines not saving state after being installed 2015-03-05 14:43:29 -05:00
Aidan C. Brady
ff91bf72fe Added new "machines" section to config - specifically enable or disable any core Mekanism machinery, including options to remove already-existing machinery from worlds 2015-03-05 13:48:01 -05:00
Aidan C. Brady
6d291c8bbc Fixed PRC energy usage 2015-03-05 09:07:40 -05:00
Aidan C. Brady
1237230637 Fixed PRC varying reaction time not being applied 2015-03-05 08:53:01 -05:00
Aidan C. Brady
abd581b2f1 Factory Installers are done! 2015-03-05 08:24:00 -05:00
Aidan C. Brady
274930fd8a Initial work complete for factory installers! Still need to add recipes and algorithm to transform generic machines into basic factories 2015-03-05 01:11:51 -05:00
Aidan C. Brady
6889bba52d Added the visuals tab. Easier than I thought! 2015-03-04 21:31:58 -05:00
Aidan C. Brady
f6a34f59bb Added another special character to filters 2015-03-04 21:04:23 -05:00
Aidan C. Brady
420a04c361 Added recipes for Induction Casing and Induction Ports, better recipes for Dynamic Tank blocks, fixed a few other recipe bugs 2015-03-04 20:54:03 -05:00
Aidan C. Brady
bb718de14b Induction Cell & Induction Provider recipes 2015-03-04 20:35:52 -05:00
Aidan C. Brady
6f0cf3a166 Fixed many bugs! 
- Asset issue with Dynamic Valve fixed
- Fixed pipes connecting to Dynamic Valves when not part of structure
- Fixed stack overflow when rendering valve fluids
- Fixed transmitter networks considering pull-based block connections as acceptor connections
- Fixed dynamic tanks maintaining a fluid type even when it has been depleted
- Fixed "clearIfNecessary()" transmitter calls not working
 2015-03-04 20:01:46 -05:00
Aidan C. Brady
09f1a04764 Doubled filter max string length from 12 characters to 24 characters, allows hyphens and spaces in filters, developed and integrated new fancy auto-scaling text renderer to prevent text overlap 2015-03-04 18:14:36 -05:00
Aidan C. Brady
7d17192173 Cardboard Box no longer picks up blocks that have -1 hardness values, also prevented Electric Chests from being vulnerable to explosives when locked 2015-03-04 17:31:52 -05:00
Aidan C. Brady
b2e532964c Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemAtomicDisassembler.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2015-03-04 14:30:05 -05:00
Aidan
0ae83150ab Merge pull request #2165 from Dannerick/myDev1 
New config entries
 2015-03-04 13:46:00 -05:00
Aidan C. Brady
df51d6f18f Fixed cables screwing up over chunk bounds 2015-03-04 13:39:25 -05:00
Aidan C. Brady
48b895b80a Fixed cables screwing up over chunk boundaries, fixed positioning of title text on certain machines, added a few tooltips to Induction Cells & Providers 2015-03-04 13:38:41 -05:00
Aidan C. Brady
af4c1c6cd7 A few fixes, need to fix an output issue 2015-03-04 13:04:32 -05:00
Aidan C. Brady
5747c9f904 Finished Matrix Statistics interface, need to figure out why induction cells aren't loading from NBT 2015-03-04 09:19:09 -05:00
Aidan C. Brady
90e8d407df Transmitter issue fixed, closes #2139 2015-03-04 00:12:01 -05:00
Aidan C. Brady
a0323f9334 A bit of work on the Matrix Stats GUI, hopefully completely fixed the transmitter issue 2015-03-04 00:11:09 -05:00
Aidan C. Brady
a18b42beee EIMs now properly store their energy in cells after destruction and extract energy from cells after creation 2015-03-03 18:36:10 -05:00
Aidan C. Brady
9260414177 Finished implementing Induction Matrix core functionality, just about everything works! Need to redesign GUI to include separate gauge for output rate 2015-03-03 18:18:32 -05:00
Aidan C. Brady
2ed43e5328 More work. @unpairedbracket, I wasn't able to get connected textures to work with my Induction Ports - would you mind taking a look at the code? 
The ports have an "output" and "input" mode with different textures, you can change the mode by shift-right clicking the port with a configurator. For some reason, no matter what I do, only the input texture is shown when I use the ctm system. For now I am using default block textures, but CTM textures are much preferred!
 2015-03-03 16:42:50 -05:00
Aidan C. Brady
13f36a52a6 Container refactoring 2015-03-03 14:02:03 -05:00
Aidan C. Brady
8d3dfc0c2c Work on EIM interface 2015-03-03 13:16:58 -05:00
Aidan C. Brady
562352d54c EIM work 2015-03-03 11:41:46 -05:00
Brian Lewis
4d8f43dbad Added atomic disassembler energy usage to config file [#2146] 2015-03-03 10:05:25 -06:00
Brian Lewis
112c1a1ba9 Add ethylene burn time as a config entry 2015-03-03 10:05:10 -06:00
Aidan C. Brady
7800447c99 Whoops 2015-03-03 00:18:50 -05:00
Aidan C. Brady
978e0801fa More work on EIM. Found some inconsistency/incomplete mechanics in the new multiblock system, no longer should be an issue 2015-03-03 00:15:18 -05:00
Aidan C. Brady
1c0fe96fed Energized Induction Matrix work! 2015-03-02 23:05:54 -05:00
Aidan C. Brady
63706900ba Hopefully fixed compile issue 2015-02-28 13:39:03 -06:00