Commit Graph

2175 Commits

Author SHA1 Message Date
CmonMate497 4f8ee738aa Changed cutoff time for furnaces and burners
Changed it to 10 mins as sometimes its really annoying when someone joins for 5 minutes doing nothing then leaves
2019-08-24 12:54:42 +01:00
Cooldude2606 e05edf5fef Prototype Done? 2019-08-24 00:02:41 +01:00
Cooldude2606 ea2ecad36b Merge pull request #128 from CmonMate497/Spelling-Errors
Spelling errors in this folder
2019-08-23 22:53:30 +01:00
CmonMate497 5e0313dd07 Merge pull request #4 from CmonMate497/CmonMate497-patch-1
Fixed spelling errors in gui.cfg
2019-08-23 22:05:25 +01:00
CmonMate497 d76e587387 Fixed spelling errors in gui.cfg 2019-08-23 22:05:09 +01:00
CmonMate497 69646fa08c Merge pull request #3 from CmonMate497/CmonMate497-patch-1
Fixed spelling mistakes in expcore.cfg
2019-08-23 22:01:42 +01:00
CmonMate497 4659933f03 Fixed spelling mistakes in expcore.cfg 2019-08-23 22:01:24 +01:00
CmonMate497 6eb31d7666 Merge pull request #2 from CmonMate497/Spelling-Errors-2
Fixed spelling errors in commands.cfg
2019-08-23 21:59:09 +01:00
CmonMate497 46479c3b86 Fixed spelling errors in commands.cfg 2019-08-23 21:58:42 +01:00
CmonMate497 ba78678d02 Fixed spelling mistakes in this patch
Can't find where {warnings.script-wrning-removed} is so don't want to touch that as another file depends on it
2019-08-23 21:50:46 +01:00
Cooldude2606 5e1be09b3c Renames in Store 2019-08-23 21:41:43 +01:00
Cooldude2606 70c60ddb5c Merge pull request #122 from zaanposni/patch/1
Changed preset color for s4sh and ArPiiX
2019-08-23 18:03:14 +01:00
Cooldude2606 8109488734 Merge pull request #127 from CmonMate497/patch-4
Fixed chat commands not working for rhd, lrd, and redmew
2019-08-23 18:00:37 +01:00
CmonMate497 b7ce264650 Update chat_reply.lua 2019-08-23 17:56:39 +01:00
Cooldude2606 ab869bf5e8 Merge branch 'patch/5.9.2' 2019-08-23 15:14:50 +01:00
Cooldude2606 85a8551613 Merge branch 'patch/5.9.2' into dev 2019-08-23 15:14:49 +01:00
Cooldude2606 1c23daa1ed Rename doc to docs 2019-08-23 15:14:36 +01:00
Cooldude2606 30d63427d7 Merge branch 'patch/5.9.1' 2019-08-22 21:04:58 +01:00
Cooldude2606 671cad3702 Merge branch 'patch/5.9.1' into dev 2019-08-22 21:04:58 +01:00
Cooldude2606 db102a79ff Fixed instant respawn and death markers 2019-08-22 20:44:01 +01:00
Cooldude2606 b95f6b99c4 Fixed destroy_if_valid for rocket gui 2019-08-22 20:36:35 +01:00
Cooldude2606 a7e6f155ae Fixed warp creation 2019-08-22 20:32:52 +01:00
Cooldude2606 792dcc0330 Fixed multiple spawn warps being created 2019-08-22 20:30:52 +01:00
Yannick 57118c2d58 Update preset_player_colours.lua 2019-08-09 20:33:51 +02:00
Yannick d193318fd6 Update preset_player_colours.lua 2019-08-09 20:18:57 +02:00
Cooldude2606 7e06bfea13 Merge branch 'release/5.9.0' 2019-08-09 18:36:44 +01:00
Cooldude2606 c1c12c5d7a Merge branch 'release/5.9.0' into dev 2019-08-09 18:36:43 +01:00
Cooldude2606 4753922fb7 Bug fixes 2019-08-09 18:36:23 +01:00
Cooldude2606 d4bcdb17d0 Readme update 2019-08-09 18:33:24 +01:00
Cooldude2606 52cc5481cf Merge pull request #120 from CmonMate497/patch-5
Gave myself a colour
2019-08-09 18:15:16 +01:00
Cooldude2606 ee759dd017 Merge pull request #119 from CmonMate497/patch-4
Update permission_groups.lua
2019-08-09 18:14:54 +01:00
Cooldude2606 f0fb99ed43 Merge branch 'feature/docs' into dev 2019-08-09 18:13:02 +01:00
Cooldude2606 84a9c869a3 Core 2019-08-09 18:12:00 +01:00
Cooldude2606 129b39bbb9 require overright 2019-08-09 16:44:27 +01:00
CmonMate497 88cd5ad2f8 Update preset_player_colours.lua 2019-08-01 14:18:03 +01:00
CmonMate497 211f9b3398 Update permission_groups.lua 2019-08-01 13:56:41 +01:00
Cooldude2606 6bab92f87f ext_require failed to erquire 2019-07-25 15:46:49 +01:00
Cooldude2606 9c5501f6a9 Addons 2019-07-23 18:01:39 +01:00
Cooldude2606 9ecd0cca0d Config 2019-07-23 17:46:49 +01:00
Cooldude2606 604fb66f46 Commands 2019-07-22 18:34:42 +01:00
Cooldude2606 57b1c530bf Guis 2019-07-22 17:53:13 +01:00
Cooldude2606 0499ad35ab Dependenices 2019-07-22 17:38:56 +01:00
Cooldude2606 e0b7174ece Removed unused resources 2019-07-22 16:38:34 +01:00
Cooldude2606 3ec20c45de feature/control-separation 2019-07-22 16:31:05 +01:00
Cooldude2606 aaded0af6b Added warps to control 2019-07-22 16:24:57 +01:00
Cooldude2606 6be712788f Added Rockets to control 2019-07-21 23:06:57 +01:00
Cooldude2606 5a9392f108 Added Tasks to control 2019-07-21 20:28:28 +01:00
Cooldude2606 841424bf76 Merge pull request #118 from CmonMate497/patch-2
Update jail.lua
2019-07-21 00:11:08 +01:00
Cooldude2606 f5619165f6 Added production to control 2019-07-20 23:44:48 +01:00
CmonMate497 2b3d58fa56 Update jail.lua 2019-07-20 19:54:16 +01:00