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

1224 commits

Author SHA1 Message Date
Aidan C. Brady
7398b21554 Loads of work on Seismic Vibrator 2014-03-15 20:05:26 -04:00
Vexatos
e9e0ae96a8 Update ItemFilterCard.java 2014-03-12 17:32:34 +01:00
tterrag1098
0859b54a55 Safer onUpdate in ItemProxy, should fix #1187 2014-03-10 17:03:22 -04:00
Aidan C. Brady
653aa6c30f A few creative enhancements 2014-03-09 21:55:01 -04:00
Aidan C. Brady
1b051c0dec Fix a tiny bug 2014-03-09 18:55:03 -04:00
Aidan C. Brady
3fd2701524 Hopefully finish GUI stuff 2014-03-09 18:51:46 -04:00
Aidan C. Brady
5bccdb7c16 Fix dumb crash 2014-03-09 18:35:31 -04:00
Aidan C. Brady
fe1f33e161 Finished material filters 2014-03-09 18:33:21 -04:00
Aidan C. Brady
bb0ad74295 Work on sorter material filters 2014-03-09 18:23:06 -04:00
Aidan C. Brady
509d857576 Just about finished, onto sorters 2014-03-09 12:10:51 -04:00
Aidan C. Brady
850481bf3d Got the GUI working mostly 2014-03-09 11:56:08 -04:00
Aidan C. Brady
1b27b6a37b Work on Digital Miner material filters 2014-03-09 11:37:42 -04:00
Aidan C. Brady
1500bfe929 Filter Cards, all done 2014-03-08 17:47:39 -05:00
Aidan C. Brady
11db9f265d Fix a bug with advanced electric machines 2014-03-08 12:01:45 -05:00
Aidan C. Brady
d553c4774e Fix a few annoying bugs 2014-03-08 11:51:13 -05:00
Aidan C. Brady
71e1e2c666 Fix key calls 2014-03-08 01:01:54 -05:00
Aidan C. Brady
1c42aebfec Several fixes 2014-03-07 22:00:35 -05:00
Aidan C. Brady
ac16039ecf Merge branch 'master' into development 
Conflicts:
	common/mekanism/client/render/MekanismRenderer.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/integration/OreDictManager.java
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/common/tile/TileEntitySalinationController.java
	common/mekanism/generators/common/MekanismGenerators.java
	common/mekanism/tools/common/MekanismTools.java
 2014-03-07 21:39:13 -05:00
Aidan C. Brady
f3ca4c5887 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/common/item/ItemAtomicDisassembler.java
 2014-03-07 21:37:30 -05:00
Aidan C. Brady
730ae963ff Added energy check for Atomic Disassembler hoe function 2014-03-07 21:36:00 -05:00
Victor Robertson
e5a6eadc45 Fix indentation and remove trailing whitespace 
This patch provides common/mekanism/*.java with standardized
indentation (tabs) and also removes trailing whitespace.
 2014-03-07 19:20:35 -06:00
Aidan C. Brady
8b70e0d50d v6.0.4 push 2014-03-07 10:46:43 -05:00
tterrag1098
ae5f3471b4 Proper charcoal block math 
Before it smelted 9 items....wat
 2014-03-05 16:38:45 -05:00
Victor Robertson
9e1b8f55f9 Add MekanismTool balance configuration 
Previously, the values for tool damage, efficiency, enchantability,
harvestLevel, and maxUses as well as values for armor durability,
enchantability, and reduction amounts were hard-coded.  Now they
are configurable via the Mekanism configuration file.
 2014-03-03 05:00:22 -06:00
Aidan Brady
0d7a1ef340 Added a necessary null check 2014-03-02 10:48:19 -05:00
Aidan Brady
346cfd3a6a Added link to Mekanism site 2014-03-01 17:58:13 -05:00
Aidan Brady
f165a6a753 Whoops! Got rid of the old Atomic Disassembler icon 2014-03-01 17:49:41 -05:00
Aidan Brady
e5b17b212d Fix Chemical Crystalizer auto-output, got that dissolution chamber to actually use sulfuric acid 2014-03-01 17:43:44 -05:00
Aidan Brady
8070b3ebd7 Bump version to 6.0.3 2014-03-01 11:12:04 -05:00
Aidan Brady
d3a3c39221 Fix panel harvest levels 2014-03-01 11:08:32 -05:00
Aidan Brady
699749312c Made generators solid 2014-03-01 10:59:54 -05:00
Aidan Brady
e27a3abae8 Fix GUI crash, items with outputs now take priority in factories and electric machines 2014-03-01 10:50:17 -05:00
Aidan C. Brady
a37b6950e6 Fix up Chemical Crystalizer saving issue 2014-02-25 07:52:15 -05:00
Aidan Brady
b8337f9bd1 Fix Chemical Dissolution Chamber progress reset 2014-02-23 14:41:42 -05:00
Aidan Brady
974f49593c A few tiny fixes 2014-02-22 14:28:02 -05:00
Aidan Brady
84d300993b Fix a teleporter issue, bump version number to 6.0.2 2014-02-22 13:58:35 -05:00
Aidan Brady
ecb410d005 Fixed recipes, added sounds 2014-02-21 17:30:40 -05:00
Aidan C. Brady
28c3b2a088 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-20 21:59:49 -05:00
Aidan C. Brady
8e6fcd1b47 Fix fancy render config not working 2014-02-20 21:59:30 -05:00
Joshua Gwinn
c8f0801486 Remove blocks that are outside of loaded chunks from bitset list 
Remove another potential source of unneeded calculations, if a digital
miner is chunkloaded and chunks it is considering are outside of loaded
chunks, they will be iterated through for each block mined.
 2014-02-20 00:25:17 -07:00
Joshua Gwinn
37321040f4 Fix additional source of Digital Miner tile entity freezing 
The function nextSetBit was incorrectly assumed to search for indexes
starting after the index given, but it in fact is inclusive with the
index given, this can lead to the while loop turning infinite if a block
it is expecting to be there isn't there.
 2014-02-19 23:52:25 -07:00
Joshua Gwinn
c3f48c333f Optimization to Digital Miner search thread 
This is a slight change to the digital miner search thread to remove the
object creation that occurs for each block checked. It is a sort of
minor thing, but it will help to keep the memory requirements for the
thread down and execution maybe slightly faster.
 2014-02-19 22:12:57 -07:00
Aidan C. Brady
7c9d267499 Fix factories resetting progress 2014-02-19 23:36:01 -05:00
Aidan C. Brady
656a1a8baa Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-19 23:21:58 -05:00
Aidan C. Brady
2ec88debdf Donator data is now pulled remotely, digital miner shouldn't halt the game anymore, fixed Electrolytic Separator issue. @pgatt, please test. 2014-02-19 23:21:52 -05:00
Aidan Brady
3d4e01400f Even more Digital Miner optimization 2014-02-17 23:46:31 -05:00
Aidan C. Brady
74e14284c7 Re-add chunk checks...whoops! 2014-02-17 21:12:33 -05:00
Aidan C. Brady
b3f9c48afe Attempt some memoization, please test and report pgatt, judge 2014-02-17 18:48:31 -05:00
Aidan C. Brady
2e8780e597 Update donator list 2014-02-17 12:03:42 -05:00
Aidan C. Brady
9915d18baa Add visible configuration to Metallurgic Infuser, made Chemical Crystalizer auto-eject and gave it inventory configuration 2014-02-17 00:14:02 -05:00
Aidan C. Brady
95698e45ea Kill off old induction stuff, bump version to 6.0.1 2014-02-16 23:50:56 -05:00
Aidan C. Brady
819e82e0f0 Fix Digital Miner issues (hopefully) 2014-02-16 23:48:06 -05:00
Aidan C. Brady
7b53164be6 Finalize release. v6 is now public. 2014-02-16 20:12:43 -05:00
Aidan C. Brady
cea0312f17 Mekanism v6 official release 2014-02-16 20:01:53 -05:00
Aidan C. Brady
40edc8d82f Digital Miner re-overhaul. Now using BitSets to reduce worst-case-scenario calculations to use less than 0.8% of the memory they did previously. CPU performance also boosted. 2014-02-16 19:47:51 -05:00
Aidan C. Brady
458276e0a1 Add a few additional recipes 2014-02-16 13:13:35 -05:00
Aidan Brady
8c8f6c32aa Fix a few issues 2014-02-15 17:10:13 -05:00
Aidan Brady
527ec1b171 Fix tesseract compatibility 2014-02-15 16:44:29 -05:00
Aidan Brady
73be8c65d7 Step 1 of another Digital Miner refactor 2014-02-15 15:00:42 -05:00
Aidan Brady
1a179b914c Fix Digital Miner text 2014-02-15 14:50:40 -05:00
Aidan Brady
1bf35e9314 Fix machine type bug 2014-02-15 13:24:34 -05:00
Aidan Brady
9ac1325b35 Revert "TEMP FIX for Wylker, will be rolled back for matured changes in v6" 
This reverts commit 0b861f71af.
 2014-02-14 19:04:06 -05:00
Aidan Brady
996b5fcf56 Final change for v6 release :) 2014-02-14 18:45:42 -05:00
Aidan C. Brady
b593c7c202 Updated IC2 API, added in option to disable particles/lighting updates on machines 2014-02-14 17:55:34 -05:00
Aidan C. Brady
27199c9721 Fix negative energy buffer issue 2014-02-14 17:45:51 -05:00
Aidan C. Brady
b2e9e03584 Redstone Block is now an infuse object 2014-02-14 17:41:34 -05:00
Aidan C. Brady
5b553c5fbc Hopefully fixed CME 2014-02-12 19:13:51 -05:00
Aidan C. Brady
e9e4d381f2 Fixed teleported crash 2014-02-12 19:08:53 -05:00
Aidan C. Brady
cf73d1f2c0 A few tiny fixes 2014-02-12 19:05:43 -05:00
Aidan C. Brady
4c4f534e5b Digital Miner overhaul - easier than I thought. Also cleanup. 2014-02-11 21:12:54 -05:00
tterrag1098
60664ef71b Formatting derps 2014-02-10 22:49:40 -05:00
tterrag1098
3a8847bdc8 Add minor safeguard for ItemProxy's in player invs 2014-02-10 22:48:52 -05:00
Aidan Brady
c05a2516b9 Preparing for DM overhaul 2014-02-10 21:59:18 -05:00
Aidan Brady
0904b4d7f6 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-10 21:12:31 -05:00
Aidan Brady
28459b134e Armored Jetpack…done. Also made Charcoal Blocks fuel sources 2014-02-10 21:10:30 -05:00
Aidan C. Brady
661d421ffe Should be fixed 2014-02-09 12:52:18 -05:00
Aidan C. Brady
4d1b3d0721 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-08 19:45:53 -05:00
Aidan C. Brady
24e7b0c450 Fix a few bugs 2014-02-08 19:41:52 -05:00
Aidan Brady
03ab491ce2 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-07 20:50:24 -05:00
Aidan Brady
d32a7f1e06 no message 2014-02-07 20:50:10 -05:00
Aidan C. Brady
b43044cc07 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 
Conflicts:
	common/mekanism/client/render/ModelCustomArmor.java
 2014-02-06 22:50:34 -05:00
Aidan C. Brady
c5634479cb Touch up on Free Runners positioning 2014-02-06 22:46:31 -05:00
Aidan Brady
f617e188f4 Quick fixes 2014-02-05 21:37:17 -05:00
Aidan Brady
81fed07f96 Start on Armored Jetpack 2014-02-05 21:25:05 -05:00
Aidan Brady
b821be5417 General enhancements 2014-02-05 20:22:43 -05:00
Aidan Brady
6e210f0730 Model positioning 2014-02-05 19:26:57 -05:00
Aidan C. Brady
879bc0e93d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-05 13:39:29 -05:00
Aidan C. Brady
2e325a0d31 Start on new Advanced Solar Generator model 2014-02-05 13:39:24 -05:00
Aidan Brady
6e1c428d32 Work on Atomic Disassembler positioning 2014-02-04 23:48:37 -05:00
Aidan Brady
afd954b510 Begin implementation of new AD model 2014-02-04 23:06:33 -05:00
Aidan Brady
316468e4ca Fix a compile error 2014-02-04 21:20:13 -05:00
Aidan
5d494a8d8d Merge pull request #963 from spookydonut/development 
Made Electrolytic Separators vent excess gas by default
 2014-02-04 14:48:53 -08:00
Aidan C. Brady
1a20773392 Added fancy Nether Steel Ore recipe 2014-02-04 12:24:39 -05:00
Aidan C. Brady
305f23d54d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-04 08:15:26 -05:00
Aidan C. Brady
89e2279cb9 Fix a few bugs 2014-02-04 08:15:20 -05:00
spookydonut (Ash Wiren)
a15d964a8a Added UI elements for #962, making electrolytic separators dump excess gas 2014-02-04 17:07:37 +08:00
spookydonut (Ash Wiren)
6400dfe3bb Made Electrolytic Separators vent excess gas by default 2014-02-04 13:29:27 +08:00
Aidan Brady
c8002dda5f Fixed Adv. Electric Machine issue, fixed crash, Robits now display moving treads 2014-02-03 21:28:48 -05:00
Aidan Brady
8145b31997 Chemical Crystalizer can now output on right side. Note that it will not auto-eject. 2014-02-02 22:07:40 -05:00
Aidan C. Brady
6eb461f569 Added missing recipes 2014-02-02 11:05:09 -05:00