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

1842 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostek00 aa4007ecf7 Update pl_PL.lang 
Translated lacking lines, moved lines to mach en_US.lang file, changed translation for some items and blocks and changed big letter for second and later words as there is no such thing in polish if it's not invented name which they aren't.
 2014-03-12 18:30:42 +01:00
Vexatos 9e4d347f8a Update en_US.lang 2014-03-12 17:34:17 +01:00
Vexatos 734f24d592 Update de_DE.lang 2014-03-12 17:33:50 +01:00
Vexatos e9e0ae96a8 Update ItemFilterCard.java 2014-03-12 17:32:34 +01:00
Vexatos 8ddc6a9c37 Update de_DE.lang 2014-03-12 17:27:56 +01:00
Vexatos 9778404451 Update de_DE.lang 2014-03-12 17:22:35 +01:00
Aidan d8ccb834f6 Merge pull request #1190 from tterrag1098/patch-4 
Safer onUpdate in ItemProxy, should fix #1187
 2014-03-10 19:10:45 -04: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 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