Aidan C. Brady
ef558016a4
A few tiny fixes
2014-03-22 12:24:09 -04:00
Aidan C. Brady
00a54498dc
Fixed Solar Generator generation
2014-03-18 17:18:54 -04:00
Aidan Brady
b6fcba4b5c
Fixed sorter halting
2014-03-16 15:16:13 -04:00
Aidan Brady
f35f9650e3
Fixed the Chemical Crystalizer
2014-03-16 12:56:02 -04:00
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
Aidan
a48fd10b2a
Merge pull request #1197 from Vexatos/patch-1
...
Update de_DE.lang and improved Filter Card localization
2014-03-13 10:28:48 -04: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
