Commit graph

3285 commits

Author SHA1 Message Date
Aidan
833064b3ab Merge pull request #3117 from EzerArch/patch-1
Part-update pt_BR lang
2016-03-04 11:01:30 -05:00
EzerArch
679aa28dd3 Part pt_BR update
Partial pt_BR locale update.
2016-03-02 12:05:26 -03:00
Ezer Arch
e3d0b76d77 Merge pull request #1 from aidancbrady/master
Sync
2016-03-02 10:53:04 -03:00
aidancbrady
9d43e4ab49 Fixed Induction Matrix issue 2016-02-28 12:31:27 -05:00
aidancbrady
baf3ae6f59 Update build number 2016-02-26 14:30:49 -05:00
Aidan
e2c2bdacf3 Merge pull request #3107 from LordSheogarad/fixRuLang
Update rus locale
2016-02-23 16:05:11 -05:00
aidancbrady
85b3e49800 Merge branch 'master' into development
* master:
  Update Danish locale
  Add Danish translation
2016-02-23 16:05:00 -05:00
Aidan
e4a00cda77 Merge pull request #3109 from LFalch/LFalch-danish-translation
Add Danish locale
2016-02-23 16:04:40 -05:00
Lucas Falch
3fe65bdb3a Update Danish locale
Correct mistakes and add missing translations
2016-02-21 23:07:18 +01:00
Lucas Falch
693e7b5e8b Add Danish translation
Still needs some extra polishing and testing
2016-02-21 17:43:26 +01:00
LordSheogarad
18a22800b4 Made text more readable, fix some mistakes 2016-02-21 08:07:09 +05:00
aidancbrady
7e9aa46fe3 Fixed chunk boundary acceptor interaction 2016-02-19 18:09:03 -05:00
aidancbrady
cde76479ab Fixed Digital Miner redstone slot interaction 2016-02-15 18:41:23 -05:00
aidancbrady
dc7f5cfc9b Merge branch 'master' into development
* master:
  Use apache library
2016-01-19 14:41:13 -05:00
aidancbrady
bfd32a1c3e Use apache library 2016-01-19 14:41:05 -05:00
aidancbrady
17425b998f Merge branch 'master' into development
* master:
  Fix a small transporter bug
2016-01-18 17:18:12 -05:00
aidancbrady
1540cd2230 Fix a small transporter bug 2016-01-18 17:18:05 -05:00
aidancbrady
c1c15ae707 Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods 2016-01-16 11:29:37 -05:00
aidancbrady
7f21516841 Fixed factory tab lighting 2016-01-13 23:15:58 -05:00
aidancbrady
2a78265419 Changed name of boiler to fix conflicts 2016-01-13 18:02:47 -05:00
aidancbrady
3f158d26da Fixed cable crash 2016-01-13 17:00:25 -05:00
aidancbrady
c03c7e0f7a Fixed Reactor Port not accepting items 2016-01-13 16:21:08 -05:00
aidancbrady
0efbd28c8f Updated Box Blacklist parser to be more intuitive 2016-01-13 16:08:14 -05:00
aidancbrady
e950c645e7 Fixed Solar Evaporation Plant memory leaks 2016-01-13 10:53:16 -05:00
aidancbrady
a8efb3b0de Better Solar Evaporation Plant algorithm- much less CPU intensive and fixes all the weird building bugs 2016-01-13 00:10:13 -05:00
aidancbrady
0961b7e042 Reactors now scale steam and water tank capacity to injection rate 2016-01-12 19:07:29 -05:00
aidancbrady
0e1a08474c Removed test recipe registration 2016-01-12 18:48:35 -05:00
aidancbrady
9b3969f1ff Shapeless Mekanism Recipes, IMC crafting recipe integration, fixed removal of machine recipes 2016-01-12 18:41:15 -05:00
aidancbrady
ab5fe0c819 Fixed IMC recipe deletion 2016-01-11 21:13:36 -05:00
aidancbrady
0b984148b4 Fixed blocks not being harvested by items with one damage level 2016-01-11 21:00:32 -05:00
aidancbrady
a72e043947 WAILA bounding block support 2016-01-11 20:55:16 -05:00
aidancbrady
72193075ab More efficient transporter tree searching 2016-01-11 20:45:13 -05:00
aidancbrady
b6306d0779 More sound fixes 2016-01-09 13:37:37 -05:00
aidancbrady
4d65942f11 Server hotfix 2016-01-09 10:07:22 -05:00
aidancbrady
99fc98faf5 Fixed HolidayManager 2016-01-08 12:24:27 -05:00
aidancbrady
faf63dfebc Updated readme, improved Electric Pump calculation 2016-01-08 00:40:37 -05:00
aidancbrady
7016268cbc Better redstone support, fixed fuse sound 2016-01-05 20:35:42 -05:00
aidancbrady
8728531f77 Add short parsing to PacketHandler 2016-01-05 15:35:36 -05:00
aidancbrady
f9681a9942 Quick lib fix 2016-01-04 18:13:46 -05:00
aidancbrady
08eb8be841 A few necessary library additions 2016-01-04 00:33:00 -05:00
aidancbrady
11574e9454 Fixed Reactor Logic Adapter double parse, thanks @habnabit 2015-12-31 15:06:11 -05:00
aidancbrady
3ff2ede090 Updated Electrolytic Separator internals to support redstone control 2015-12-31 14:55:49 -05:00
aidancbrady
bd3bc4402f Fix Metallurgic Infuser upgrade slot conflict 2015-12-31 14:25:26 -05:00
aidancbrady
a71b6bda01 Adjustable Flamethrower modes - combat, heat, and inferno 2015-11-28 08:58:26 -07:00
aidancbrady
f88a97697f Fixed Gas Tank comparator support 2015-11-27 23:29:55 -07:00
aidancbrady
21fa9fdb26 Cleaned up computer integration 2015-11-27 23:19:29 -07:00
aidancbrady
c2006d5e70 Computer integration fixes 2015-11-27 23:04:43 -07:00
aidancbrady
a4ab830e79 Cleanup, added Redstone Logic Adapter OC support 2015-11-27 22:04:39 -07:00
aidancbrady
fbd692b4e0 Fixed transporter tier calculations 2015-11-27 12:30:49 -07:00
aidancbrady
f5c48f60e6 Teleport now specifies orientation, closes #2977 2015-11-27 10:41:45 -07:00