FireBall
|
ef3cb0a455
|
Merge pull request #781 from yueh/fix-p2p-missing-super-call
Added missing super calls
|
2015-01-22 11:05:23 -05:00 |
|
yueh
|
be82dfec1f
|
Added missing super calls
|
2015-01-19 22:51:41 +01:00 |
|
Chris
|
8eb5ad01cf
|
Merge pull request #776 from al-myr/patch-1
Update pt_BR.lang
|
2015-01-19 12:22:42 -08:00 |
|
|
Chris
|
a3c5e4cb05
|
Merge pull request #738 from TheJulianJES/Crank-Fix
Fix #701
|
2015-01-19 12:15:05 -08:00 |
|
yueh
|
c35e057d96
|
Merge pull request #742 from LeerSpace/patch-1
fixed two grammatical errors
|
2015-01-19 19:53:35 +01:00 |
|
|
yueh
|
a5a80b58d5
|
Merge pull request #677 from yueh/feature-remove-annihilation-buffer
Removed buffer from annihilation plane
|
2015-01-19 19:47:36 +01:00 |
|
|
yueh
|
c10c809c9e
|
Merge pull request #734 from yueh/feature-formation-plane-drop-blocks
Formation plane can now drop blocks as items
|
2015-01-19 19:45:04 +01:00 |
|
|
yueh
|
3d2bd84450
|
Merge pull request #761 from yueh/fix-760
Improved the logged warning for FailledConnection
|
2015-01-19 19:44:15 +01:00 |
|
|
yueh
|
2776b2d430
|
Merge pull request #733 from yueh/fix-emitter-offline-network
Disable level emitter on offline networks
|
2015-01-19 19:44:01 +01:00 |
|
|
yueh
|
f0d04699d1
|
Merge pull request #621 from thatsIch/b-304-waila-channels
Fixes #304 WAILA Integration updated and fixed
|
2015-01-19 19:43:06 +01:00 |
|
Al
|
afbce77d0b
|
Update pt_BR.lang
|
2015-01-19 07:51:22 -03:00 |
|
|
yueh
|
3a5844a0fe
|
Improved the logged warning for FailledConnection
Now displays to coordinates of the affected tunnels.
|
2015-01-18 20:46:37 +01:00 |
|
John Reed
|
e2798aaaf4
|
fixed two grammatical errors
replaced "a" with "an" where appropriate
|
2015-01-17 12:23:19 -06:00 |
|
TheJulianJES
|
99d86511a1
|
Fix #701 - Changed harvest tool to axe
|
2015-01-17 15:07:01 +01:00 |
|
|
yueh
|
a8c920932e
|
Formation plane can now drop blocks as items
|
2015-01-16 19:58:11 +01:00 |
|
|
yueh
|
bd9eaa2d48
|
Disable level emitter on offline networks
Turns off level emitters if the goes offline because it runs out of power,
channels or similar.
|
2015-01-15 14:06:23 +01:00 |
|
thatsIch
|
c6f232ab63
|
Fixes #304 WAILA Integration updated and fixed
WAILA offers a new interface to sync the server data to the client.
|
2015-01-04 00:06:09 +01:00 |
|
|
yueh
|
29a4464e18
|
Removed buffer from annihilation plane
|
2015-01-03 16:26:23 +01:00 |
|
|
yueh
|
63e375f208
|
Merge pull request #679 from yueh/fix-colliding-entityfx
Fix colliding entityfx
|
2015-01-02 23:53:58 +01:00 |
|
|
yueh
|
2f51568772
|
Effects should not collide with anything
|
2015-01-02 20:37:48 +01:00 |
|
|
thatsIch
|
59adde7c6b
|
Spellings and enums equality
|
2015-01-02 00:01:34 +01:00 |
|
|
thatsIch
|
52c512635d
|
Renamed constants
|
2015-01-01 22:13:10 +01:00 |
|
|
thatsIch
|
e0175bac98
|
Finalize static field
|
2015-01-01 21:45:03 +01:00 |
|
|
thatsIch
|
63ab2bbad0
|
Remove unsed method
|
2015-01-01 21:42:14 +01:00 |
|
|
thatsIch
|
33b04f6ff9
|
Removed obsolete Hashtable and replaced it with an HashMap
|
2015-01-01 21:38:52 +01:00 |
|
|
thatsIch
|
236f6f72e3
|
finalize fields
|
2015-01-01 21:19:50 +01:00 |
|
|
thatsIch
|
8920d949d2
|
this access
|
2015-01-01 21:17:00 +01:00 |
|
|
thatsIch
|
eed0c11d7f
|
Replaced equals enum equality check with ==
|
2015-01-01 21:16:04 +01:00 |
|
|
thatsIch
|
8179259afa
|
Replaced C-style array instantiation with Java-Style
|
2015-01-01 21:15:03 +01:00 |
|
|
thatsIch
|
e38293a291
|
Added missing javadoc return statement
|
2015-01-01 21:00:39 +01:00 |
|
|
yueh
|
15ba197083
|
Merge pull request #668 from yueh/fix-666
Fixes #666 Only convert to a cablebus if an IPartItem is attached
|
2015-01-01 15:35:57 +01:00 |
|
|
yueh
|
ff903e65a5
|
Fixes #666 Only convert to a cablebus if an IPartItem is attached
|
2014-12-31 18:21:15 +01:00 |
|
thatsIch
|
305fc6c7f2
|
Merge pull request #664 from thatsIch/b-663-disabled-facades
Fixes #663 NPE on disabled Facades
|
2014-12-30 23:34:57 +01:00 |
|
|
thatsIch
|
ada69b9a95
|
Fixes #663 NPE on disabled Facades
|
2014-12-30 23:18:38 +01:00 |
|
|
thatsIch
|
97dabc4a5c
|
Merge pull request #660 from thatsIch/b-659-NPE-sculpting-tool
Fixes #659 NPE on usage of the FZ sculpting tool
|
2014-12-30 14:06:08 +01:00 |
|
|
thatsIch
|
fec00fee17
|
Fixes #659 NPE on usage of the FZ sculpting tool
|
2014-12-30 11:55:47 +01:00 |
|
|
thatsIch
|
02e59faa59
|
Remove comment
|
2014-12-29 23:02:48 +01:00 |
|
|
thatsIch
|
a23a8ed165
|
Merge pull request #657 from yueh/organize-imports
Organize imports
|
2014-12-29 22:16:24 +01:00 |
|
|
yueh
|
9b7b0fc0fb
|
Organize imports
|
2014-12-29 21:59:05 +01:00 |
|
|
thatsIch
|
ddf71c5072
|
Merge pull request #611 from TheJulianJES/Log-Fix
Better log output at AE2 starting
|
2014-12-29 21:54:34 +01:00 |
|
|
thatsIch
|
2b34ba5840
|
Merge pull request #652 from thatsIch/b-644-NPE-on-disabled-features
Fixes #644 Several missing null checks when disabling huge chunks of the mod via config
|
2014-12-29 20:20:38 +01:00 |
|
|
thatsIch
|
3554b5f48d
|
Fixes #644 Several missing null checks when disabling huge chunks of the mod via config
|
2014-12-29 17:58:19 +01:00 |
|
|
thatsIch
|
eb74fb33b8
|
Merge pull request #653 from yueh/qualified-this
Changed access to use this qualifier
|
2014-12-29 15:44:27 +01:00 |
|
|
yueh
|
f471513bd0
|
Changed access to use this qualifier
|
2014-12-29 15:13:47 +01:00 |
|
|
thatsIch
|
2a5e57a59b
|
Merge pull request #642 from Adaptivity/patch-1
Update ru_RU.lang
|
2014-12-28 23:45:57 +01:00 |
|
Anton
|
e37d9099c7
|
Update ru_RU.lang
|
2014-12-28 22:24:53 +03:00 |
|
|
thatsIch
|
e712a9d8ce
|
Merge pull request #640 from thatsIch/b-639-crash-on-disabled-channels
Fixes #639 Missing null check for people with disabled channels
|
2014-12-28 18:38:56 +01:00 |
|
|
thatsIch
|
0cb58b4d93
|
Fixes #639 Missing null check for people with disabled channels
|
2014-12-28 18:00:04 +01:00 |
|
|
thatsIch
|
f7323289a5
|
Merge pull request #625 from thatsIch/b-624-pickaxe
Fixes #624 Missing check to disable features
|
2014-12-27 19:05:37 +01:00 |
|
|
thatsIch
|
366d1a0a5d
|
Merge pull request #629 from 61352151511/patch-1
Fix grammatical error
|
2014-12-25 14:17:29 +01:00 |
|