Commit Graph

681 Commits

Author SHA1 Message Date
Cooldude2606
65b29d46e0 Fixed Nuke And Base Damage 2018-03-06 18:36:10 +00:00
badgamernl
17d60d1c03 fixing member repair 2018-02-25 21:21:53 +01:00
Cooldude2606
9980fd6205 Merge branch 'core.bak' into master.bak 2018-02-21 20:47:48 +00:00
Cooldude2606
ed007ecf29 Fixed Mem To Vet Promote 2018-02-21 20:47:29 +00:00
Cooldude2606
d45e5a1abc A Few Edits To Player Search And Added Eddy To Admin 2018-02-19 21:46:02 +00:00
Cooldude2606
357b96225c Fixed Report System 2018-02-18 21:34:16 +00:00
Cooldude2606
8d156876c2 Mods are admin again 2018-02-15 14:42:23 +00:00
badgamernl
5c2de2996b Caner is the best!
Fixed en locale files edited by caner
2018-02-14 17:38:13 +01:00
Unknown
9796839694 Merge remote-tracking branch 'origin/revert-25-patch-18' 2018-02-13 21:36:08 +00:00
Unknown
7ea2a79123 Merge remote-tracking branch 'origin/master' 2018-02-13 21:36:02 +00:00
Cooldude2606
2114cb86b1 Fixed Direction Of Sign 2018-02-13 21:33:49 +00:00
badgamernl
4aeef3f465 Revert "Update warp-system.cfg" 2018-02-13 09:23:59 +01:00
badgamernl
232f25f977 Merge pull request #26 from MarwinPhilips/GermanTranslationRework
Rework of the German translation
2018-02-12 21:49:35 +01:00
MarwinPhilips
94b2bf6956 Rework of the German translation 2018-02-12 21:31:06 +01:00
Unknown
9293a8d9f0 Merge branch 'core' 2018-02-12 16:16:25 +00:00
Cooldude2606
a437611466 Big Error 2018-02-12 16:15:38 +00:00
badgamernl
e06455f843 Merge pull request #20 from CanerAkar/patch-13
Update reports.cfg
2018-02-12 15:22:47 +01:00
badgamernl
44fb944f6c Merge pull request #25 from CanerAkar/patch-18
Update warp-system.cfg
2018-02-12 15:22:35 +01:00
badgamernl
cc470f48e6 Merge pull request #22 from CanerAkar/patch-15
Update science.cfg
2018-02-12 15:22:27 +01:00
badgamernl
20a8571837 Merge pull request #24 from CanerAkar/patch-17
Update tree-decon.cfg
2018-02-12 15:22:20 +01:00
badgamernl
72ae04deec Merge pull request #23 from CanerAkar/patch-16
Update tasklist.cfg
2018-02-12 15:22:14 +01:00
badgamernl
9ebec0e7c9 Merge pull request #21 from CanerAkar/patch-14
Update rockets.cfg
2018-02-12 15:22:05 +01:00
Caner
ddb4b83bb5 Update warp-system.cfg 2018-02-12 15:20:59 +01:00
Caner
50c4022738 Update tree-decon.cfg 2018-02-12 15:19:25 +01:00
Caner
3472b7f620 Update tasklist.cfg 2018-02-12 15:18:17 +01:00
Caner
9667519064 Update science.cfg 2018-02-12 15:17:17 +01:00
Caner
0ca7b37dab Update rockets.cfg 2018-02-12 15:15:26 +01:00
Caner
cc113f61cb Update reports.cfg 2018-02-12 15:13:34 +01:00
badgamernl
deabf80816 Merge pull request #9 from CanerAkar/patch-2
Update announcements.cfg
2018-02-12 14:52:51 +01:00
badgamernl
9aacce5186 Merge pull request #10 from CanerAkar/patch-3
Update auto-message.cfg
2018-02-12 14:52:41 +01:00
badgamernl
5076b4503a Merge pull request #11 from CanerAkar/patch-4
Update capsules.cfg
2018-02-12 14:52:32 +01:00
badgamernl
1aba3671a2 Merge pull request #12 from CanerAkar/patch-5
Update exp-core.cfg
2018-02-12 14:52:24 +01:00
badgamernl
d96333bfa8 Merge pull request #13 from CanerAkar/patch-6
Update game-settings.cfg
2018-02-12 14:52:13 +01:00
badgamernl
913aaebe1e Merge pull request #16 from CanerAkar/patch-9
Update player-list.cfg
2018-02-12 14:52:06 +01:00
badgamernl
d458a82f54 Merge pull request #19 from CanerAkar/patch-12
Update readme.cfg
2018-02-12 14:51:57 +01:00
badgamernl
690d3acfa8 Merge pull request #18 from CanerAkar/patch-11
Update rank-changer.cfg
2018-02-12 14:51:50 +01:00
badgamernl
4a0271f221 Merge pull request #17 from CanerAkar/patch-10
Update polls.cfg
2018-02-12 14:51:42 +01:00
badgamernl
8dff53f1dd Merge pull request #15 from CanerAkar/patch-8
Update player-info.cfg
2018-02-12 14:51:20 +01:00
badgamernl
1ef605c666 Merge pull request #14 from CanerAkar/patch-7
Update inventory-search.cfg
2018-02-12 14:51:10 +01:00
badgamernl
934ccc5ff6 Merge pull request #8 from CanerAkar/patch-1
Update admin.cfg
2018-02-12 14:50:31 +01:00
Caner
f2ae6661c0 Update readme.cfg 2018-02-12 14:49:06 +01:00
Caner
cb8d0f5f56 Update rank-changer.cfg 2018-02-12 14:25:52 +01:00
Caner
945cf42433 Update polls.cfg 2018-02-12 14:22:44 +01:00
Caner
b52a879a4a Update player-list.cfg 2018-02-12 14:21:38 +01:00
Caner
c39269ef8a Update player-info.cfg 2018-02-12 14:20:40 +01:00
Caner
410db832c2 Update inventory-search.cfg 2018-02-12 14:10:16 +01:00
Caner
1d6fabe7bc Update game-settings.cfg 2018-02-12 14:07:53 +01:00
Caner
cb210ead3b Update exp-core.cfg 2018-02-12 13:55:49 +01:00
Caner
f27b27b57e Update capsules.cfg 2018-02-12 13:52:09 +01:00
Caner
351101cd36 Update auto-message.cfg 2018-02-12 13:49:56 +01:00