Aidan C. Brady
a1d91a3e26
Added a few missing recipes
2014-03-15 20:41:42 -04:00
Aidan C. Brady
92cfba7308
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-03-15 20:32:29 -04:00
Aidan C. Brady
e77229817d
Fix a few bugs
2014-03-15 20:31:31 -04:00
Aidan C. Brady
5172071a68
Polished off vibrator/reader
2014-03-15 20:21:36 -04:00
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
