Upstream/BungeeCord
1
0
Fork 0
mirror of https://github.com/SpigotMC/BungeeCord.git synced 2024-11-04 01:30:25 +01:00
Code Issues Projects Releases Wiki Activity
1,359 Commits 20 Branches 6 Tags 17 MiB
d9a8311b8e
Commit Graph

926 Commits

Author SHA1 Message Date
md_5
a53b63720b Add a comment 2014-06-26 19:24:05 +10:00
md_5
348457f613 Quickly test SO_REUSEADDR 2014-06-26 19:19:11 +10:00
md_5
fbb2f695b0 Show correct error when cannot bind query 2014-06-26 19:08:05 +10:00
RuriRyan
489242b1ef Fixed RemoteQuery, which broke with the Epoll update 2014-06-25 23:29:08 +02:00
md_5
4ac117fb4c Actually include native code, thanks again @normanmaurer 2014-06-25 18:21:59 +10:00
md_5
500b0af782 [Performance] Attempt to use Netty's Epoll implementation on Linux. 
This will attempt to make use of Netty's EpollEventLoopGroup and Epoll(Server)SocketChannel when on Linux and the native libraries load correctly. It should bring a large increase in performance and hopefully reliability. Big thanks to the @netty team for implementing this and @normanmaurer for some tips on the support detection.

Feedback is appreciated.
 2014-06-25 18:14:50 +10:00
md_5
2b304ecebc Close plugin log handlers on disable 2014-06-24 18:22:35 +10:00
md_5
923aa05d4a Downgrade forced hosts errors to a warning log level 2014-06-24 16:56:24 +10:00
md_5
e54388a5e0 Add matchPlayer API 2014-06-23 17:26:30 +10:00
md_5
59ba644623 Make IP command tabbable - closes #999 2014-06-23 17:16:14 +10:00
maciekmm
4d1f0cbb26 Added getKickedFrom() to ServerKickEvent. 2014-06-22 17:11:27 +10:00
md_5
e849afbb23 Add simple address cache for those with slow or otherwise unresponsive DNS servers. 
I wonder when @netty was supposed to add async dns lookups.
 2014-06-20 20:04:22 +10:00
Gabscap
f6e41c856c Closing all handlers on stop() 2014-06-20 19:28:01 +10:00
md_5
b167a45690 Revert "Reenable throttle since we only support 1.7+" 
This reverts commit f23691df23.
 2014-06-13 16:25:53 +10:00
vemacs
31bd836203 Write server name in ServerIP subchannel response. 
Behaves similarly to the UUIDOther implementation.
 2014-06-11 16:13:32 +10:00
Jonas Konrad
4dce37cd13 Prefix "BungeeCord > " to forwarded MC|Brand messages [Fixes #1038] 2014-06-11 16:12:30 +10:00
md_5
f23691df23 Reenable throttle since we only support 1.7+ 2014-06-11 16:08:33 +10:00
md_5
77f6930280 Mojang allows multiple status queries in a connection, we should too. 2014-06-11 16:07:14 +10:00
md_5
9604a9a31e Show 1.7.9 as supported version 2014-06-11 16:05:07 +10:00
md_5
91989564e5 Add method to get player's locale 2014-06-11 16:03:10 +10:00
md_5
9226df86f0 Lazy init vhost address. 2014-05-31 18:46:35 +10:00
md_5
ad2ff54b76 Bump a few versions, should probably think about exposing the new EPollEventLoop. 2014-05-15 17:07:31 +10:00
md_5
ece641da23 Change lobby to fallback in fallback_lobby translation. 2014-05-03 17:31:19 +10:00
Thinkofdeath
33a098f4ba Merge branch 'vemacs-master' 2014-05-01 11:00:12 +01:00
vemacs
e4e01ccb55 Null check 2014-05-01 10:59:14 +01:00
GunfighterJ
84c7e073e0 Grammar Nazi 2014 2014-04-26 13:44:59 -05:00
Jonas Konrad
a56bbe38b2 toString for BungeeServerInfo 2014-04-22 15:24:18 +02:00
md_5
312a74c5f1 Close #963 - log remote ping errors to console, friendly message to clients. 2014-04-19 19:48:43 +10:00
vemacs
71c86f9f90 Add ServerIP subchannel 2014-04-18 10:33:26 -06:00
Thinkofdeath
6475385f87 Use ProtocolConstants instead of raw protocol numbers 2014-04-16 14:57:09 +01:00
Thinkofdeath
6775b9230c Update Team packet's field names. unknown -> nameTagVisibility, unknown2 -> color 2014-04-16 14:46:48 +01:00
Thinkofdeath
c8e6b6fd7a Add 'Combat Event' to 14w11a's EntityMap 2014-04-16 14:34:30 +01:00
Thinkofdeath
bca3663a1f Add 'Camera' to 14w11a's EntityMap 2014-04-16 14:26:11 +01:00
Thinkofdeath
f71272a1c0 Add 14w11a EntityMap support 2014-04-16 11:56:04 +01:00
Thinkofdeath
ca7c755ecd Split up EntityMap into different protocol versions 2014-04-16 11:14:29 +01:00
md_5
5a638f2290 Enable 14w11 support, changing servers is a bit iffy though due to EntityMap not being complete. 2014-04-16 11:01:41 +10:00
md_5
3715756be7 Update packets for MINECRAFT_14_11_a 2014-04-16 10:48:40 +10:00
md_5
bc2b4db419 Replace literal numbers with usages of the ProtocolConstants class. 2014-04-16 10:18:16 +10:00
Jonas Konrad
e2eba52162 Revert "Revert "Implement Favicon API"" 
This reverts commit 13decac4b9.
 2014-04-15 20:17:26 +10:00
md_5
13decac4b9 Revert "Implement Favicon API" 
This reverts commit 18316eb5f8.
 2014-04-15 15:08:12 +10:00
md_5
b08f1995f6 Return most recent protocol version to 'unsupported' server lists 2014-04-15 11:08:28 +10:00
Keir Nellyer
a642346a2c Add method to get a connected player via their UUID 2014-04-15 11:07:17 +10:00
Jonas Konrad
18316eb5f8 Implement Favicon API 2014-04-15 11:05:20 +10:00
md_5
3ced0b675d Implement Skin forwarding - YOU MUST UPDATE SPIGOT FIRST 2014-04-15 10:38:15 +10:00
md_5
dc2da29c16 Code format. 2014-04-13 14:15:41 +10:00
Thinkofdeath
3b71a2b570 Fix ping decoding (Fixes #969) 2014-04-13 00:07:11 +01:00
Thinkofdeath
1aa5379030 Handle new clients pinging old versions (Fixes #972 and Fixes #969) 2014-04-12 10:16:58 +01:00
Thinkofdeath
153bca00be Fix 1.7.7 support 2014-04-10 13:34:08 +01:00
Thinkofdeath
747628f40c Remove @RequiredArgsConstructor from PlayerInfoSerializer as the javadoc fails to build with it 2014-04-09 21:01:33 +01:00
Thinkofdeath
bf9521472b Support setting uuid's on ServerPing.PlayerInfo + fix plugins which don't provide a valid uuid. 2014-04-09 20:26:07 +01:00
Thinkofdeath
86ef046544 Pass the protocol version through when using ping pass through 2014-04-09 16:42:08 +01:00
Thinkofdeath
cd518690fd Rewrite the spawn player packet's uuid to support skins on non ip-fowarded servers 2014-04-04 12:14:04 +01:00
Thinkofdeath
1d3adc5317 1.7.6-pre1 Support 2014-04-04 21:42:10 +11:00
Keir Nellyer
13848def72 Return a Users UUID as a UUID object whilst keeping support for returning as a String 2014-04-04 21:35:07 +11:00
md_5
52bf6184c7 Don't disable find by default 2014-03-30 15:53:57 +11:00
md_5
f7a5748464 Delay event loop initialization until after system properties are set. Closes #943 2014-03-29 15:21:04 +11:00
md_5
1bbbfdb0d5 Close #938 - re add our register channel manipulation 2014-03-20 20:12:06 +11:00
Jonas Konrad
92ebce2ec6 Add TabCompleteEvent 2014-03-14 20:51:47 +11:00
kamcio96
9cd7c1ac03 Add ProxyReloadEvent 2014-03-14 20:49:45 +11:00
md_5
924dcaab38 Move default server fallback 2014-03-14 19:29:13 +11:00
Thinkofdeath
49f4dcb5b7 Ensure we have the capacity to resize the buffer 2014-03-13 19:51:46 +00:00
Thinkofdeath
13d679e7d7 Correctly resize the spawn object packet 2014-03-13 19:30:27 +00:00
md_5
575a6b6ea0 Fix some errors related to disabling modules - #890 2014-03-11 15:16:52 +11:00
Thinkofdeath
2a7ad3c2b2 Append/trim extra data for spawn object packets with a 0 id 2014-03-10 19:25:15 +00:00
md_5
00352f585a Revert code which wasn't meant to be commited. 2014-03-10 13:36:17 +11:00
md_5
290e31b4c5 Update some depend versions, leaving netty for a later date when there aren't as many recent changes. 2014-03-10 11:34:35 +11:00
Jonas Konrad
52fbceec54 Fix client disconnects when a server goes down - #886 2014-03-10 11:17:52 +11:00
md_5
4a7f8015e5 Close #918 - use case insensitive lookup for Yaml locations 2014-03-10 11:04:46 +11:00
md-5
003a1973d4 Update CommandEnd javadoc 2014-03-10 09:23:44 +11:00
md_5
eec3c09c32 Tweak ciper messages - closes #905 2014-02-27 16:00:44 +11:00
md_5
565af4d53e Remove switchMutex since its no longer required 2014-02-27 07:32:23 +11:00
md_5
37ed331515 Ensure user's client and server component are both in the same event loop. Probably closes #893 2014-02-26 21:28:04 +11:00
Thinkofdeath
38f12840ca Correct component loop detector 2014-02-21 20:56:10 +00:00
Thinkofdeath
941450b4e4 Detect component loops 2014-02-21 10:13:40 +00:00
md_5
d98ade5a9b Mojang uses "if > 100", therefore the inverse of that is "if <=100" regarding chat length. 2014-02-13 07:25:56 +11:00
md_5
0f24eaeea3 Mojang caps chat to 100, we should too 2014-02-12 19:59:02 +11:00
md_5
a9b2660aa8 Unknown git commit or version = unknown version sig 2014-02-12 19:15:00 +11:00
md-5
b3627652f2 Merge pull request #869 from Cube-Space/permission-api 
Added getPermissions() to the CommandSender API
 2014-02-09 14:36:15 +11:00
md_5
b5216148d6 Remove a bit of synchronization 2014-02-09 11:02:26 +11:00
Fabian Fassbender
4faf507ad9 Added getPermissions() to the CommandSender API to get a unmodifiable Collection of all Permissions. The ConsoleSender returns an empty Set where as the UserConnection gives its real Permissions. 2014-02-08 14:17:01 +01:00
md_5
9a4f0a6f59 Revert disconnect change. Forgot we use void futures. 2014-02-08 12:42:27 +11:00
md_5
015dc0c65a Dem string typos 2014-02-08 12:21:13 +11:00
md_5
c1b9e9032f Fix typo 2014-02-08 12:20:08 +11:00
md_5
5e5038c839 Fix Java 7 detection - closes #861 2014-02-08 09:40:08 +11:00
md_5
36ea27454d Disable selector rebuild - closes #851 2014-02-08 09:39:45 +11:00
md_5
2eb2953442 Optimize throwing of CancelSendSignal's by storing a single instance. 2014-02-08 09:36:41 +11:00
md_5
4abffa9f24 Optimize / clean up server disconnect method 2014-02-08 09:33:05 +11:00
md_5
f08df9555c Remove dead IP forward code, Mojang aint bringing that one back 2014-02-08 09:19:28 +11:00
Thinkofdeath
4c5689d10e Fix typo in EntityMap 2014-02-04 11:03:12 +00:00
md_5
224db6596e Make console log handler obey Filters. Closes #866 2014-02-04 16:44:53 +11:00
md_5
4fa137a465 Add java property for log date format, closes #764 2014-02-02 12:45:53 +11:00
md_5
0d7ee821d2 Adjust wording - closes #823 2014-02-02 12:43:18 +11:00
md_5
ddab9a84c4 Close #859 - more favicon validation 2014-02-02 12:20:37 +11:00
md_5
19b4c09a16 Remove unused fields 2014-02-01 10:38:43 +11:00
md_5
35a5230b52 Remove artifacts from legacy forge support. 2014-02-01 10:38:43 +11:00
md_5
90fcfecb7c Use lombok for vhost 2014-02-01 10:38:43 +11:00
md-5
542d2c2a5b Close #850 - send 127 for legacy protocol version 2014-02-01 09:27:22 +11:00
md_5
842392d59c Dual version entity ID rewriting 2014-01-27 11:39:10 +11:00
md_5
b2f517fa63 Implement dual protocol version support. 2014-01-27 11:26:27 +11:00
md_5
5f7963b0c4 Add more validation to server icons. Closes #828 2014-01-22 12:16:48 +11:00
md_5
dae96ac18b Close #819 - remove trailing . from hostname if it exists 2014-01-22 12:09:29 +11:00
md_5
aa91354666 Make sure plugin onLoad is really called onLoad. This fixes regression #822 from when we implemented plugin depends. 2014-01-22 12:07:16 +11:00
md_5
219d485835 Make the yaml reconnect handler a module 2014-01-17 09:25:22 +11:00
md_5
6602c22147 Ensure modules are enabled even when we can't detect version 2014-01-14 13:18:14 +11:00
md_5
f1b329bf21 Finish implementing modules. If anyone wants to test... be my guest. 2014-01-14 13:13:27 +11:00
md_5
ab1aacbdc9 Implement a first tempt and module retrieval system 2014-01-13 15:16:17 +11:00
md_5
a426a5ec22 Implement module loader, blacklist this build from loading. 2014-01-13 14:28:07 +11:00
md_5
7483b4d276 Shuffle some internal stuff to API so that modules will compile 2014-01-10 09:58:31 +11:00
md_5
4be58a7c00 Copy across all the commands and add their bootstrap plugins. 2014-01-10 09:53:33 +11:00
md_5
986f52b1e1 Try harder to find translations when not using English. Closes #787 2014-01-05 11:34:34 +11:00
md_5
7faefde51b Add name_too_long translation 2014-01-05 11:27:19 +11:00
TheUnnamedDude
8c367d86e7 Properly kick older clients 2014-01-05 11:25:42 +11:00
md_5
80caa2b669 Code format :( 2014-01-03 19:52:35 +11:00
md_5
9f8c04ef86 Update some dependency versions: Guava, MySQL, JavaAssist, Netty. 2014-01-03 19:51:44 +11:00
Thinkofdeath
e7f1a88e6e Formatting fixes 2013-12-30 16:15:39 +00:00
kosgan10
5e57356e6a Change Exception > Throwable 2013-12-30 18:10:39 +02:00
kosgan10
f3766bc10b Fix hover messages for players 2013-12-30 18:07:30 +02:00
kosgan10
6c795a25ff Change message to use ComponentBuilder 2013-12-30 15:43:58 +02:00
kosgan10
d3159fe6ca Fix imports 2013-12-30 15:38:13 +02:00
kosgan10
93ba9b3a3e Fix errors for console 2013-12-30 15:36:35 +02:00
Thinkofdeath
c184667a26 Add packet names as comments to EntityMap to make updating between versions easier 2013-12-28 22:55:09 +00:00
md_5
5ea4763ae9 Implement UUID forwarding, you MUST update Spigot for this to work 2013-12-24 10:10:11 +11:00
md_5
d0d0f4ec9f Make getPlayers a little safer. Should probably use a CopyOnWrite collection though. 2013-12-23 17:41:27 +11:00
Keir Nellyer
608eaace1c Fix NPE when no Callback is defined FIXES #772 2013-12-21 12:14:42 +00:00
md_5
075518b643 Implement a connect callback - see #760 2013-12-21 13:11:27 +11:00
md_5
f7d3dfd61d Show severe error for missing forced error, but don't crash 2013-12-20 18:57:13 +11:00
md_5
b713ccff10 Validate forced hosts config on reload 2013-12-19 19:30:24 +11:00
md_5
60d6f31876 Generate offline mode UUIDs the same way Mojang does. 2013-12-16 22:41:19 +11:00
Thinkofdeath
359e2b2a16 Fix typo in /alertraw error message 2013-12-15 13:17:29 +00:00
thinkofdeath
0dcba749dc Merge pull request #748 from thinkofdeath/master 
Chat Component API
 2013-12-14 02:31:42 -08:00
Thinkofdeath
5d68b422e5 Add ComponentBuilder + make events final 
An example of ComponentBuilder usage can be found at CommandAlertRaw
 2013-12-10 11:50:34 +00:00
Thinkofdeath
6093cde93f Fix last commit 2013-12-08 18:04:20 +00:00
Thinkofdeath
4537055caa Fix shooterID/ownerID not getting remapped 2013-12-08 17:36:29 +00:00
Thinkofdeath
17fc120e07 Move 0x13 to clientbound only 2013-12-08 16:47:17 +00:00
Thinkofdeath
230cca0f9e Fix server-bound entity ids as well 2013-12-08 16:42:49 +00:00
Thinkofdeath
cfda905d98 Fix entity id remapping 
The old system only worked in ints and 1.7 changed some to varints. Since the length of the varint is variable more work is needed to remap ids
 2013-12-08 15:09:12 +00:00
Thinkofdeath
bc746a546f Added another unit test + formatted code 2013-12-08 10:17:02 +00:00
Thinkofdeath
70bb3ddcce Added some unit tests 2013-12-08 00:48:10 +00:00
Thinkofdeath
0040955204 Fix events not working when no formatting is used 2013-12-07 13:59:00 +00:00
Thinkofdeath
60e2e6bfa4 Add /alertraw command + fix events 2013-12-07 13:35:52 +00:00
Thinkofdeath
c7e590e286 Move en_US.properties to mojang-translations/en_US.properties 2013-12-06 23:21:52 +00:00
Thinkofdeath
696679809d Support printing TranslatableComponents 2013-12-06 23:18:10 +00:00
Thinkofdeath
e3e551d825 Use varargs instead of arrays 2013-12-06 23:02:05 +00:00
Thinkofdeath
854b6faf0e Fixed broadcasts getting double logged 2013-12-06 22:40:41 +00:00
Thinkofdeath
890fac27c5 More formatting fixes 2013-12-06 22:40:40 +00:00
Thinkofdeath
35c1b26a20 Fix formatting 2013-12-06 22:40:40 +00:00
Thinkofdeath
2c8b15cb1e Use components for ServerKickEvent (fixes #744) + minor refactoring 2013-12-06 22:40:40 +00:00
Thinkofdeath
c20d8f9cd6 Chat Component API 2013-12-06 22:40:40 +00:00
md_5
85c27f30ee Properly abort kicks on ServerConnector 2013-12-07 09:33:37 +11:00
Thinkofdeath
54d307da57 Reduce the size of json output 
Nulls are not outputted (https://sites.google.com/site/gson/gson-user-guide#TOC-Null-Object-Support)
 2013-12-03 08:17:38 +11:00
Thinkofdeath
81e43aab98 Update ChatConverter 2013-12-03 08:17:38 +11:00
Thinkofdeath
18db187347 Use the ChatConverter from spigot to fix 1.7 formatting bugs 2013-12-03 08:17:38 +11:00
hcherndon
aad83d787f Add methods to expose parts of the proxy internal config. This is depreceated as it is subject to breaking changes without warning. 2013-12-02 15:17:19 +11:00
Keir Nellyer
af751dae5a Add new plugin message sub-channels to get a players real UUID 2013-12-02 08:37:17 +11:00
md_5
f7851b0436 Implement ServerDisconnectEvent. Wow so many server switch events. 2013-11-25 11:12:49 +11:00
md_5
94ee61cd35 Native cipher, with more smoke tests! 2013-11-19 07:16:06 +11:00
md_5
897a59254c Still segfaulting. 2013-11-18 20:00:15 +11:00
ninja-
c70006a36c Implement new, high-performance cipher in native code. Currently available only for Linux-x64, other platforms will fallback to Java cipher. 2013-11-18 07:17:14 +11:00
md_5
12ef019d69 Revert native cipher, causing SIGSEGV 2013-11-17 16:51:11 +11:00
ninja-
fc189e81d5 Implement new, high-performance cipher in native code. Currently available only for Linux-x64, other platforms will fallback to Java cipher. 2013-11-17 15:59:18 +11:00
md-5
aaa8b4a53d Forgot to rewrite 0x1A, thanks @Mati0703 2013-11-17 14:45:58 +11:00
md_5
e39428ea0b Mojang can't seem to decide what chat format to use for kicks, so lets just send a literal without our own prefix through. This (uncleanly) closes #714. 2013-11-16 11:22:38 +11:00
md_5
e4602f027e Don't pointlessly create new gson instances 2013-11-16 11:11:43 +11:00
md_5
3ae8308a4b Small cleanup 2013-11-15 16:53:10 +11:00
md_5
cc0d3a8e49 Config -> Conf to prevent messup with shades. How did this skip by? 2013-11-06 20:12:39 +11:00
md_5
f81bf8e7c5 Code format + fix pom 2013-11-06 20:11:17 +11:00
zh32
e755573fb3 Removed unused import and made code nicer. 2013-11-06 20:07:16 +11:00
zh32
a201b5897a Added async PreLoginEvent to change online mode per connection. 2013-11-06 20:07:16 +11:00
md_5
8e390b5714 Proper replacement for #701, closes #691 2013-11-05 18:16:33 +11:00
md_5
14371a1a8c Don't rewrite the actual host packet, just a copy. 2013-11-05 18:07:55 +11:00
md_5
61326db3ee Not having a good night, thought I removed that code. 2013-11-03 18:00:30 +11:00
md_5
90625bc196 Remove test code 2013-11-03 17:15:44 +11:00
md_5
155e274e72 Fix disconnects during LoginEvent when using online mode clients 2013-11-03 17:04:59 +11:00
md_5
04b52aa4f4 Close #699 - case sensitivity of command tab complete 2013-11-03 10:02:37 +11:00
md_5
4040d9f20a [Breaking] Fix player online sample 2013-11-01 22:00:46 +11:00
md_5
02619c6132 Close #689 - fix serverinfo.ping 2013-11-01 17:52:14 +11:00
md_5
26863032a1 Fix #671 - user timing out when connectNow is used. 2013-11-01 17:46:41 +11:00
md_5
a0d3bf97d1 Close #690, wire up the old proxy ping event for old clients 2013-11-01 17:43:03 +11:00
md_5
3becbe4d38 Fix #686 - rewriting of bows and fishing hooks 2013-11-01 17:38:53 +11:00
md_5
7205e69ce6 Correct some issues with being banned. See #658 which may be relevant 2013-11-01 17:24:35 +11:00
md_5
c84d6f0035 Add really efficient text -> json translation. Doesn't support format codes yet. 2013-11-01 17:14:18 +11:00
md_5
20b1b37e54 Did someone say great performance increases? 2013-10-28 20:43:28 +11:00
md_5
2117a6b7de Undo kick changes 2013-10-27 21:41:10 +11:00
md_5
e6c1015027 Reload favicon on greload 2013-10-27 20:07:36 +11:00
md_5
8665784bb5 Oh right, stage 2013-10-27 18:23:07 +11:00
md_5
efd5bd58e4 Fix colours wrapping, somewhat 2013-10-27 18:18:44 +11:00
md_5
e006673550 Fix kicks + don't allow connections to online mode servers 2013-10-27 18:12:18 +11:00
md_5
2129cb3614 Fix kicks? 2013-10-27 18:09:27 +11:00
md_5
b9158b7322 Implement 1.7 style pings 2013-10-27 12:59:35 +11:00
md_5
5dfd14fbe5 Enhance ping API 2013-10-27 12:36:30 +11:00
md_5
e1f7b7b126 Add new ip forward method, must be manually enabled 2013-10-27 12:06:17 +11:00
md_5
e2e32100cd Common method to wrap text. Thanks @lazertester 2013-10-25 20:39:06 +11:00
md_5
a7e4854661 Fix kick 2013-10-25 20:09:18 +11:00
md_5
6e69d476ef Fix 1.7 potion etc support 2013-10-25 17:25:13 +11:00
md_5
1e2eda94db Don't log metrics 2013-10-24 07:14:06 +11:00
md_5
37dc600fe0 BungeeCord can into server icon 2013-10-23 20:44:48 +11:00
md_5
0952e53d11 Update to 1.7 poms. 2013-10-23 17:33:21 +11:00
md_5
cdf47d84d8 Fix offline mode. Latest snapshot appears to be pretty much functional, although the client itself seems to have some reliability issues. 2013-10-19 20:01:22 +11:00
md_5
b7babd2888 Fix ping player counts being swapped 2013-10-19 17:56:14 +11:00
md_5
da5fa4bb7c Fix outdatedness 2013-10-19 17:50:54 +11:00