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

679 commits

Author SHA1 Message Date
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
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
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
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
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
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
Aidan C. Brady
98d1a647cb Rename Salination Plant to Solar Evaporation Plant 2015-02-23 08:08:54 -05:00
Aidan
079ca960ee Merge pull request #2128 from chrixian/master 
Shift-click items to top (fill) slot
 2015-02-20 10:55:07 -05:00
Ben Spiers
dd404b4209 Let's try that again, shall we? Reimplement redstone checks to not load chunks. 2015-02-20 13:56:36 +00:00
Aidan C. Brady
bf4b74f535 A few fixes 2015-02-19 17:17:28 -05:00
Aidan C. Brady
a9a506fe4a Merge branch 'master' into development 2015-02-19 16:53:15 -05:00
Aidan C. Brady
1e78cbf60e Fixed an impossible crash 2015-02-19 16:53:06 -05:00
Aidan C. Brady
ce29270d21 Merge branch 'master' into development 2015-02-19 16:35:09 -05:00
Aidan C. Brady
46f5a941ad Cleanup 2015-02-19 16:34:59 -05:00
Aidan
def3d6a729 Merge pull request #2141 from Dannerick/MyDev2 
[#2069] Fix for modded items being added to cardboardbox blacklist
 2015-02-19 16:34:00 -05:00
Aidan C. Brady
2fe4cf290d Merge branch 'master' into development (@unpairedbracket, make sure I did this right) 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/util/MekanismUtils.java
 2015-02-19 16:12:28 -05:00
Ben Spiers
17f9f88b34 Prevent Osmium Compressor and Combiner from using secondary energy upgrades. 
Also make them deterministic again to prevent them getting stuck
 2015-02-19 16:36:16 +00:00
Aidan C. Brady
cb377f88ab Fixed duplicate method 2015-02-19 09:15:56 -05:00
Aidan C. Brady
f67c048e78 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
 2015-02-19 09:15:30 -05:00
Aidan C. Brady
c59b64f7c9 Merged changes 2015-02-19 09:15:00 -05:00
Aidan C. Brady
0819c0ad5f Hopefully fixed the transmitter network halt issue. Provide feedback! 2015-02-19 09:13:03 -05:00
Aidan C. Brady
b419519cc0 Chemical Infuser, Chemical Washer and Electrolytic Separator are now upgradeable 2015-02-18 19:33:03 -05:00
Brian Lewis
e842556c5b [#2069] Fix for modded items being added to cardboardbox blacklist 2015-02-18 17:30:09 -06:00
Aidan C. Brady
f320aa4337 Merge branch 'master' into development 2015-02-17 21:35:01 -05:00
Aidan C. Brady
dcf7d7772a Fixed a transporter output bug 2015-02-17 21:34:36 -05:00
Aidan C. Brady
25df777b84 Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades 2015-02-17 21:27:35 -05:00
Aidan C. Brady
cb2e38ec61 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
 2015-02-16 18:13:03 -05:00
Aidan C. Brady
488af7e8ae Fixed facing updates not being sent out by machines 2015-02-16 18:12:31 -05:00
Aidan C. Brady
d33af99b87 More cleanup 2015-02-16 18:11:45 -05:00
Aidan C. Brady
548145ae02 Revert "Revert "Fix some transmitter issues."" 
This reverts commit e9ef6c1866.
 2015-02-16 17:24:51 -05:00
Aidan C. Brady
e9ef6c1866 Revert "Fix some transmitter issues." 
This reverts commit f63807c75a.
 2015-02-16 17:21:39 -05:00
Aidan C. Brady
03f6156d23 Minor cleanup 2015-02-16 17:20:51 -05:00
Aidan C. Brady
3561f9fe59 Merge branch 'master' into development 
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/tools/common/MekanismTools.java
 2015-02-16 14:40:10 -05:00
Ben Spiers
0cef749249 Actually increment the Mod classes' versions 2015-02-13 14:40:14 +00:00
Christian Ehrhardt
db4adce2a8 Shift-click items to top (fill) slot 2015-02-12 19:18:16 -06:00
Aidan C. Brady
0612712abe Fixed energy cubes not outputting items 2015-02-11 08:43:32 -05:00
Aidan C. Brady
81c948f28d Fixed capes 2015-02-11 08:36:52 -05:00