Commit Graph

529 Commits

Author SHA1 Message Date
Devin Ryan
df72b98d53 Add .DS_Store to gitignore 2016-03-01 19:09:25 -06:00
Cryptkeeper
c7d481fffc Note the difference between branches 2016-02-23 19:44:15 -06:00
Cryptkeeper
c8c5cf19c4 Use example configurations 2016-02-23 19:42:19 -06:00
Cryptkeeper
cd6bf07346 Update README.md 2016-02-23 19:39:36 -06:00
Cryptkeeper
790227764a Merge pull request #31 from Cryptkeeper/categories
Categories
2016-02-23 19:33:40 -06:00
Cryptkeeper
1280226874 Bump version to 2.1.0 2016-02-23 19:29:28 -06:00
Cryptkeeper
11aca2cb19 Update CHANGELOG regarding categories branch 2016-02-23 19:28:44 -06:00
Cryptkeeper
3ed9b85db4 Show category options if there's more than 1 category 2016-02-23 19:21:13 -06:00
Cryptkeeper
9ac6502394 Allow the server to control category visibility 2016-02-23 19:19:15 -06:00
Cryptkeeper
28160054c0 Left align this 2016-02-23 18:52:30 -06:00
Cryptkeeper
6204a536c4 New header, controls for category visibility 2016-02-23 18:47:27 -06:00
Cryptkeeper
2fa3f08ae8 Replace the old compass favicon with a custom one
So we aren’t using someone’s art
2016-02-23 16:40:27 -06:00
Cryptkeeper
3e93533cdf Revert "Rearrange GotPvP"
This reverts commit 260906df1f515ead0cba8fb332f4a8d26bc460f9.
2016-02-23 16:22:02 -06:00
Cryptkeeper
260906df1f Rearrange GotPvP 2016-02-23 16:21:00 -06:00
Cryptkeeper
dbbf225dea Fix merge conflict in servers.json 2016-02-23 16:17:39 -06:00
Cryptkeeper
a97a33c3c5 Remove PhanaticMC until the issue is corrected 2016-02-23 16:04:32 -06:00
Cryptkeeper
56385534c5 Remove duplicate network 2016-02-23 16:01:39 -06:00
Cryptkeeper
4e2524771d Add play.guildcraft.org 2016-02-23 15:58:49 -06:00
Cryptkeeper
35dc04e139 Merge pull request #29 from Techcable/patch-1
Add PhanaticMC
2016-02-23 15:50:10 -06:00
Cryptkeeper
64931260a0 Remove GommeHD and TheArchon
Neither are responding to pings for several days.
2016-02-23 15:50:00 -06:00
Techcable
ca0ced7728 Add PhanaticMC 2016-02-11 21:52:39 -07:00
Cryptkeeper
584d7374df Fix missing servers when refreshing too early 2016-02-06 18:36:51 -06:00
Cryptkeeper
798dda8f12 Fix frontend not updating publicConfig.json
This changes the handshake sequence to use “bootTime” (a unique key
based off the time) to make sure the frontend configuration matches the
current one. If not, the client pulls the update and validates before
requesting the listing.
2016-02-06 18:26:29 -06:00
Cryptkeeper
143e99876a Ability to categorize networks 2016-02-06 17:34:33 -06:00
Cryptkeeper
d6d59cad12 Merge pull request #25 from Arjenpro/patch-1
Added GuildCraft
2016-02-06 16:03:32 -06:00
Cryptkeeper
e1e3e4458c Merge pull request #26 from niklaswa/patch-1
Added Timolia
2016-02-06 16:03:22 -06:00
Niklas
4d3d4da011 Added Timolia 2016-02-05 19:50:55 +01:00
Arjen
c62659117f Update servers.json
Added GuildCraft.
2016-02-01 19:06:46 +01:00
Cryptkeeper
f372a5562a Include date of 2.0.0 update 2016-02-01 05:47:36 -06:00
Cryptkeeper
c2dd49bf15 Merge pull request #24 from Cryptkeeper/new-design
2.0.0
2016-02-01 05:46:54 -06:00
Cryptkeeper
08376575ab I should probably sleep. 2016-02-01 05:44:56 -06:00
Cryptkeeper
c1c66c8f50 Fix bad references 2016-02-01 05:44:07 -06:00
Cryptkeeper
5edd13ac5d Log this for debug purposes 2016-02-01 05:43:23 -06:00
Cryptkeeper
6e620e759f Merge branch 'master' into new-design 2016-02-01 05:41:24 -06:00
Cryptkeeper
bc100a661d Adjust "Empire Minecraft" to "Empire MC" 2016-02-01 05:41:17 -06:00
Cryptkeeper
ff503f6036 Merge branch 'master' into new-design 2016-02-01 05:40:22 -06:00
Cryptkeeper
841deb4851 Add Empire Minecraft 2016-02-01 05:39:49 -06:00
Cryptkeeper
a4db8b7b48 Merge remote-tracking branch 'origin/new-design' into new-design 2016-02-01 05:38:19 -06:00
Cryptkeeper
728823ac0d Merge branch 'master' into new-design 2016-02-01 05:38:17 -06:00
Cryptkeeper
7a1613537e Merge pull request #23 from TitanicFreak/master
Remove vikkcraft
2016-02-01 05:38:01 -06:00
Cryptkeeper
b1e2f8007d Note the movement of server listing 2016-02-01 05:37:16 -06:00
Cryptkeeper
6e65955983 Fix spacing typo in README 2016-02-01 05:36:41 -06:00
Cryptkeeper
c5e37a3f0d Increase version to 2.0.0 2016-02-01 05:36:26 -06:00
Cryptkeeper
3f1323970b Include a link to the CHANGELOG in the README 2016-02-01 05:36:12 -06:00
Cryptkeeper
41c5b46f51 Create CHANGELOG.md 2016-02-01 05:34:51 -06:00
Cryptkeeper
4af3d8a85f Avoid race conditions 2016-02-01 05:32:00 -06:00
Cryptkeeper
808418f6bd Correctly init these 2016-02-01 05:31:00 -06:00
Cryptkeeper
ae018acba4 Load back the graph controls 2016-02-01 05:29:09 -06:00
Cryptkeeper
1e5b5efc48 Remove the data if needed 2016-02-01 05:23:42 -06:00
Cryptkeeper
01c427eea2 Fix hooking 2016-02-01 05:21:46 -06:00