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

1187 commits

Author SHA1 Message Date
Aidan C. Brady
855a5acf1d Code cleanup 2015-03-11 15:41:13 -05:00
Aidan
a86bb36ca0 Merge pull request #2193 from Siigari/development 
Remastered and looped audio correctly.
 2015-03-11 11:01:01 -05:00
Aidan C. Brady
8da23839f3 Merge branch 'master' into development 
Conflicts:
	src/main/resources/assets/mekanism/sounds/Elementizer.ogg
 2015-03-11 11:00:32 -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
Siigari
71d712e4f6 Remastered and looped audio correctly. 2015-03-09 20:35:28 -07:00
Siigari
58ea87fef0 Remastered and downmixed audio, improved levels and created seamless looping. 2015-03-09 19:58:07 -07: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
Aidan C. Brady
ce31b1e22c Start work on the Energized Induction Matrix. This is going to be fun! 2015-02-28 13:08:17 -06:00
Aidan C. Brady
a5507a88f2 Yet again bump up energy production 2015-02-28 11:42:50 -06:00
Aidan C. Brady
4aa032717e Gave all Mekanism multiblocks the sparkle animation when formed, gave Fusion Reactor a big loud sound effect, also lowered the energy required to ignite the reactor yet again (may bump up before release) 2015-02-27 22:49:48 -06:00
Aidan C. Brady
24935dd51e Change that back - I need to get a better understanding for these underlying mechanics 2015-02-27 19:18:11 -06:00
Aidan C. Brady
410e298b8e Scaled up Universal Cable throughput in preparation for reactor output rate, may need to further scale in the future 2015-02-27 18:28:21 -06:00
Aidan C. Brady
b51aa0ee83 A few fixes, temporary x10 energy scale up to allow for higher energy production 2015-02-27 18:19:13 -06:00
Aidan C. Brady
439a734ce0 Fixed up Solar Neutron Activator NEI handler, better DT fuel texture 2015-02-27 14:06:38 -05:00
Aidan C. Brady
66c74c6643 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-02-27 13:42:46 -05:00
Aidan C. Brady
dd254ef326 Better NEI integration, fixed a major issue with the Chemical Washer recipe handler, finished off Solar Neutron Activator 2015-02-27 13:42:38 -05:00
Ben Spiers
f2859cacbb Rename EnergyUtils to UnitDisplayUtils 2015-02-27 17:33:14 +00:00
Ben Spiers
fa9588d557 Add a proper temperature display utility 2015-02-27 17:33:14 +00:00
Ben Spiers
743d80b516 Reduce energy input needed to ignite fusion by factor of 10 2015-02-27 17:33:14 +00:00
Ben Spiers
a478ad0c4f Make statistics tab more explanatory 2015-02-27 17:33:14 +00:00
Aidan C. Brady
c4c2f97170 A few bug fixes 2015-02-27 10:09:28 -05:00
Aidan C. Brady
84ab0ecb3f Lasers now have fancy sound effects! 2015-02-27 01:57:54 -05:00
Aidan C. Brady
48c872ec37 Fixes 2015-02-27 00:47:08 -05:00
Aidan C. Brady
9c7831d07b Work on reactor interface a tad, work on Solar Neutron Activator 2015-02-27 00:28:46 -05:00
Aidan C. Brady
89de5ccea7 More fixes 2015-02-26 22:45:10 -05:00
Aidan C. Brady
341885b2ea Fixed some dropper bugs 2015-02-26 22:28:10 -05:00
Aidan C. Brady
183da4ef75 Finished droppers! 2015-02-26 21:09:04 -05:00
Aidan C. Brady
c39e3d1c1f More dropper work 2015-02-26 20:50:02 -05:00
Aidan C. Brady
49d0a7fc4b Work on droppers! Easiest way to get rid of leftover fluids and gasses in machine gauges. 2015-02-26 19:30:19 -05:00
Aidan C. Brady
7a1085d38d More work 2015-02-26 17:36:24 -05:00
Aidan C. Brady
5767bfb22e Work on Solar Neutron Activator and its recipe system 2015-02-26 17:23:53 -05:00
Aidan C. Brady
74ba02e0bb Polished off the upgrade system - now works consistently and properly for all Mekanism machines. Also, fixed a flamethrower bug 2015-02-26 16:47:36 -05:00
Aidan C. Brady
c7e199b06c Fixed Rotary Condensentrator upgrade inventory 2015-02-26 10:56:12 -05:00
Aidan C. Brady
999502a053 Half-implemented Solar Neutron Activator 2015-02-25 11:11:30 -05:00
Aidan C. Brady
a38090a521 Fixed flamethrower scaling 2015-02-25 10:13:22 -05:00
Aidan C. Brady
1675b9b1cf Flamethrowers now properly check collisions, these things are awesome 2015-02-25 10:02:04 -05:00
Aidan C. Brady
f5dadf443a Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
 2015-02-25 09:16:54 -05:00
Aidan C. Brady
bf42f71b8e Fixed a few crashes 2015-02-25 09:15:08 -05:00
Aidan C. Brady
701cdfd7bd Fixed a crash 2015-02-25 09:05:08 -05:00
Aidan C. Brady
3ba4c738a8 Item reorganization, lithium creation 2015-02-25 09:03:14 -05:00
Aidan C. Brady
955160ff45 Lithium! 2015-02-25 08:44:24 -05:00
Aidan C. Brady
cd25811f31 Fixed Solar Evaporation Controller recipe handler 2015-02-24 19:49:40 -05:00
Aidan C. Brady
62791baec7 Solar Evaporation Plant fixes 2015-02-24 14:11:26 -05:00
Aidan C. Brady
457d465165 Fix a few renames 2015-02-24 11:08:04 -05:00
Aidan C. Brady
888d1bdad8 Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe 2015-02-24 10:59:03 -05:00
Aidan C. Brady
29e50a34fa Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
 2015-02-24 10:42:55 -05:00
Aidan C. Brady
d2f941e630 Recipe fixes, fixed Portable Tank filling 2015-02-24 10:32:41 -05:00
Aidan C. Brady
d432fc979c Merge branch 'master' into development 2015-02-24 08:40:19 -05:00