Commit Graph

3428 Commits

Author SHA1 Message Date
Cooldude2606 63bca4ebba Merge branch 'WIP' into Testing 2017-03-26 16:04:37 +01:00
Cooldude2606 44b408d982 Fixing order 2017-03-26 16:04:30 +01:00
Cooldude2606 120324380f Merge branch 'master' into WIP 2017-03-26 15:58:53 +01:00
Cooldude2606 b7b40d63d5 Revert "Merge branch 'Testing' into WIP"
This reverts commit b929f8fb90.
2017-03-26 15:55:27 +01:00
Cooldude2606 ba6bcb717f Merge branch 'Testing' 2017-03-26 15:55:15 +01:00
Cooldude2606 b929f8fb90 Merge branch 'Testing' into WIP 2017-03-26 15:54:57 +01:00
Cooldude2606 287952311b Add rules 2017-03-26 15:54:39 +01:00
Cooldude2606 7f96bf26c5 Merge branch 'Testing' 2017-03-25 21:45:39 +00:00
Cooldude2606 40ec5c3120 Auto message every 15 minutes 2017-03-25 21:45:25 +00:00
Cooldude2606 533e975a5e Merge branch 'Testing' 2017-03-25 20:39:02 +00:00
Cooldude2606 8a22dde149 forgot to minify 2017-03-25 20:38:50 +00:00
Cooldude2606 876f12458b Merge branch 'Testing' 2017-03-25 20:36:14 +00:00
Cooldude2606 87a6f9d0b3 Fixed a testing error 2017-03-25 20:36:00 +00:00
Cooldude2606 e9f69fde54 Merge branch 'Testing' 2017-03-25 11:12:44 +00:00
Cooldude2606 f732e9382d Used same compression on tick to hour/minute 2017-03-25 11:04:18 +00:00
Cooldude2606 de5213d601 Merge branch 'WIP' into Testing 2017-03-25 10:59:53 +00:00
Cooldude2606 d971d7e5e8 inprovements to auto message 2017-03-25 10:55:05 +00:00
Cooldude2606 39f5ba20c5 Merge branch 'Testing' 2017-03-24 20:45:58 +00:00
Cooldude2606 3b08a64172 Merge branch 'WIP' into Testing 2017-03-24 20:32:08 +00:00
Cooldude2606 aed031e095 Fix a big error in the player list 2017-03-24 20:31:44 +00:00
Cooldude2606 b80b6677a8 Merge pull request #2 from badgamernl/Testing
Test to master
2017-03-22 21:28:46 +00:00
Cooldude2606 faaecc5fb1 Merge pull request #1 from badgamernl/WIP
Testing - New Button - Test Push To Testing From WIP
2017-03-22 21:27:21 +00:00
Cooldude2606 4c83e1a4eb Testing - New Button 2017-03-22 21:21:48 +00:00
badgamernl f2be703f68 fix for map load again............. 2017-03-22 22:12:53 +01:00
badgamernl 5ba74ed5ff map not able to load fix 2017-03-22 22:09:31 +01:00
badgamernl 0aeeb5c79c Create README.md 2017-03-22 21:13:45 +01:00
badgamernl aa5d5b75e6 init 2017-03-22 21:12:10 +01:00
badgamernl 97c0ace968 :neckbeard: Added .gitattributes & .gitignore files 2017-03-22 21:10:06 +01:00