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

1627 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
71c041917d Merge branch 'master' into development 2014-03-08 16:26:50 -05:00
Aidan C. Brady
4f69850f17 v6.0.4 release 2014-03-08 16:26:36 -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
Aidan
989ae66414 Update README.md 2014-03-07 21:35:06 -05:00
Aidan
d870bb91bf Merge pull request #1170 from vmrob/whitespace 
Fix indentation and remove trailing whitespace
 2014-03-07 21:19:12 -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
Aidan
9d8a6c9e4c Merge pull request #1158 from BrunoLG/patch-1 
Patch 1
 2014-03-07 09:18:28 -05:00
BrunoLG
15243254a2 Merge pull request #1 from Mr-Turing/patch-2 
Update pt_BR.lang...Obrigado Pela Ajuda :)
 2014-03-06 22:41:52 -03:00
Aidan
5e01d9c9de Merge pull request #1151 from tterrag1098/patch-2 
Proper charcoal block math
 2014-03-06 19:41:54 -05:00
Aidan
5e9159ba0f Merge pull request #1149 from BrunoLG/patch-1 
Create pt_BR.lang
 2014-03-06 19:41:06 -05:00
Mr-Turing
afc8f5b8f5 Update pt_BR.lang 
Fixed minor mistakes and added to pt_BR translation.
Still missing tooltips and equipment.
 2014-03-06 15:51:13 -03:00
tterrag1098
ae5f3471b4 Proper charcoal block math 
Before it smelted 9 items....wat
 2014-03-05 16:38:45 -05:00
BrunoLG
82bc0afcb8 Create pt_BR.lang 2014-03-05 15:54:26 -03:00
Aidan
b7491e2882 Merge pull request #1133 from vmrob/tool-armor-config 
Add MekanismTool tool and armor balance to configuration file
 2014-03-03 08:50:26 -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
4d949f3985 Merge branch 'master' into development 2014-03-01 15:25:15 -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
1012d90337 Merge pull request #1111 from mymagadsl/patch-2 
Update zh_TW.lang
 2014-02-27 08:22:06 -05:00
mymagadsl
40e64fed63 Update zh_TW.lang 
fix: 
tile.MachineBlock2.OxidationChamber.name=化學氧化機
to:
tile.MachineBlock2.ChemicalOxidizer.name=化學氧化機
 2014-02-26 23:44:03 +08: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
3bae3c9e55 Merge pull request #1093 from mymagadsl/patch-1 
Create zh_TW.lang
 2014-02-23 14:23:03 -05:00
mymagadsl
94dffbf4a1 Create zh_TW.lang 
Modified from zh_cn.lang
 2014-02-23 12:53:03 +08:00
Aidan Brady
974f49593c A few tiny fixes 2014-02-22 14:28:02 -05:00
Aidan Brady
5af38f38d9 v6.0.2 release 2014-02-22 14:02:10 -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
5b7a889be2 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-21 17:31:33 -05:00
Aidan Brady
ecb410d005 Fixed recipes, added sounds 2014-02-21 17:30:40 -05:00
Aidan
81aff1e521 Merge pull request #1079 from Vexatos/patch-1 
Update de_DE.lang
 2014-02-21 13:53:55 -05:00
Vexatos
f26c84283f Update de_DE.lang 2014-02-21 18:48:10 +01: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
Aidan
42747c80d5 Merge pull request #1066 from JDGBOLT/development 
Digital Miner additional Fixes
 2014-02-20 21:57:45 -05:00