HASH 71875273f417
DATE 2025-11-27
SUBJECT ookstats: merge
FILES 3 CHANGED
HASH 71875273f417
DATE 2025-11-27
SUBJECT ookstats: merge
FILES 3 CHANGED
┌─ merges-back.json ─────────────────────────────────────────────────────────┐
│ diff --git a/merges-back.json b/merges-back.json │
│ new file mode 100644 │
│ index 0000000..ae165cd │
│ --- /dev/null │
│ +++ b/merges-back.json │
│ @@ -0,0 +1,92 @@ │
│ +{ │
│ + "merges": [ │
│ + { │
│ + "from": {"name": "tradias", "realm": "venoxis", "region": "eu"}, │
│ + "to": {"name": "tradias", "realm": "ook-ook", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "betterwizard", "realm": "venoxis", "region": "eu"}, │
│ + "to": {"name": "betterwizard", "realm": "ook-ook", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "trubble", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "trubble", "realm": "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "resinflake", "realm": "whitemane", "region": "us"}, │
│ + "to": {"name": "nikita", "realm": "immerseus", "region": "us"} │
│ + }, │
│ + { │
│ + "from": {"name": "skocesx", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "skoces", "realm": "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "tiquilli", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "tiquilli", "realm": "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "somewaay", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "someway", "realm": "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "somewhaat", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "somewhat", "realm": "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "copypastt", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "copypastt", "realm": "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "airye", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "airye", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "liiri", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "liiri", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "aquitani", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "aquitani", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "aquidoti", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "aquidoti", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "pekaa", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "peka", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "nifflerx", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "nifflerx", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "carufera", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "carufera", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "raid?n", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "raid?n", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "plastpriest", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "plastpriest", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "crawkegs", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "crawkegs", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "shamiinaqt", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "shamiinaqt", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "coby", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "coby", "realm": "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "siorrayxd", "realm": "firemaw", "region": "eu"}, │
│ + "to": {"name": "siorrayxd", "realm": "shekzeer", "region": "eu"} │
│ + } │
│ + ] │
│ +} │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ merges-back.json ───────────────────┐
│ diff --git a/merges-back.json b/merges-back. │
│ json │
│ new file mode 100644 │
│ index 0000000..ae165cd │
│ --- /dev/null │
│ +++ b/merges-back.json │
│ @@ -0,0 +1,92 @@ │
│ +{ │
│ + "merges": [ │
│ + { │
│ + "from": {"name": "tradias", "realm": │
│ "venoxis", "region": "eu"}, │
│ + "to": {"name": "tradias", "realm": "o │
│ ok-ook", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "betterwizard", "rea │
│ lm": "venoxis", "region": "eu"}, │
│ + "to": {"name": "betterwizard", "realm │
│ ": "ook-ook", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "trubble", "realm": │
│ "gehennas", "region": "eu"}, │
│ + "to": {"name": "trubble", "realm": "g │
│ aralon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "resinflake", "realm │
│ ": "whitemane", "region": "us"}, │
│ + "to": {"name": "nikita", "realm": "im │
│ merseus", "region": "us"} │
│ + }, │
│ + { │
│ + "from": {"name": "skocesx", "realm": │
│ "gehennas", "region": "eu"}, │
│ + "to": {"name": "skoces", "realm": "ga │
│ ralon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "tiquilli", "realm": │
│ "gehennas", "region": "eu"}, │
│ + "to": {"name": "tiquilli", "realm": " │
│ garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "somewaay", "realm": │
│ "gehennas", "region": "eu"}, │
│ + "to": {"name": "someway", "realm": "g │
│ aralon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "somewhaat", "realm" │
│ : "gehennas", "region": "eu"}, │
│ + "to": {"name": "somewhat", "realm": " │
│ garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "copypastt", "realm" │
│ : "gehennas", "region": "eu"}, │
│ + "to": {"name": "copypastt", "realm": │
│ "garalon", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "airye", "realm": "f │
│ iremaw", "region": "eu"}, │
│ + "to": {"name": "airye", "realm": "she │
│ kzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "liiri", "realm": "f │
│ iremaw", "region": "eu"}, │
│ + "to": {"name": "liiri", "realm": "she │
│ kzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "aquitani", "realm": │
│ "firemaw", "region": "eu"}, │
│ + "to": {"name": "aquitani", "realm": " │
│ shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "aquidoti", "realm": │
│ "firemaw", "region": "eu"}, │
│ + "to": {"name": "aquidoti", "realm": " │
│ shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "pekaa", "realm": "f │
│ iremaw", "region": "eu"}, │
│ + "to": {"name": "peka", "realm": "shek │
│ zeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "nifflerx", "realm": │
│ "firemaw", "region": "eu"}, │
│ + "to": {"name": "nifflerx", "realm": " │
│ shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "carufera", "realm": │
│ "firemaw", "region": "eu"}, │
│ + "to": {"name": "carufera", "realm": " │
│ shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "raid?n", "realm": " │
│ firemaw", "region": "eu"}, │
│ + "to": {"name": "raid?n", "realm": "sh │
│ ekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "plastpriest", "real │
│ m": "firemaw", "region": "eu"}, │
│ + "to": {"name": "plastpriest", "realm" │
│ : "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "crawkegs", "realm": │
│ "firemaw", "region": "eu"}, │
│ + "to": {"name": "crawkegs", "realm": " │
│ shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "shamiinaqt", "realm │
│ ": "firemaw", "region": "eu"}, │
│ + "to": {"name": "shamiinaqt", "realm": │
│ "shekzeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "coby", "realm": "fi │
│ remaw", "region": "eu"}, │
│ + "to": {"name": "coby", "realm": "shek │
│ zeer", "region": "eu"} │
│ + }, │
│ + { │
│ + "from": {"name": "siorrayxd", "realm" │
│ : "firemaw", "region": "eu"}, │
│ + "to": {"name": "siorrayxd", "realm": │
│ "shekzeer", "region": "eu"} │
│ + } │
│ + ] │
│ +} │
└──────────────────────────────────────────────┘
┌─ merges.json ──────────────────────────────────────────────────────────────┐
│ diff --git a/merges.json b/merges.json │
│ new file mode 100644 │
│ index 0000000..c10d0d5 │
│ --- /dev/null │
│ +++ b/merges.json │
│ @@ -0,0 +1,8 @@ │
│ +{ │
│ + "merges": [ │
│ + { │
│ + "from": {"name": "pleeigh", "realm": "gehennas", "region": "eu"}, │
│ + "to": {"name": "pleeigh", "realm": "garalon", "region": "eu"} │
│ + } │
│ + ] │
│ +} │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ merges.json ────────────────────────┐
│ diff --git a/merges.json b/merges.json │
│ new file mode 100644 │
│ index 0000000..c10d0d5 │
│ --- /dev/null │
│ +++ b/merges.json │
│ @@ -0,0 +1,8 @@ │
│ +{ │
│ + "merges": [ │
│ + { │
│ + "from": {"name": "pleeigh", "realm": │
│ "gehennas", "region": "eu"}, │
│ + "to": {"name": "pleeigh", "realm": "g │
│ aralon", "region": "eu"} │
│ + } │
│ + ] │
│ +} │
└──────────────────────────────────────────────┘
┌─ web/.astro/data-store.json ───────────────────────────────────────────────┐
│ diff --git a/web/.astro/data-store.json b/web/.astro/data-store.json │
│ index 50de610..20ae198 100644 │
│ --- a/web/.astro/data-store.json │
│ +++ b/web/.astro/data-store.json │
│ @@ -1 +1 @@ │
│ -[["Map",1,2],"meta::meta",["Map",3,4,5,6],"astro-version","5.12.0","astro-config- │
│ digest","{\"root\":{},\"srcDir\":{},\"publicDir\":{},\"outDir\":{},\"cacheDir\":{} │
│ ,\"site\":\"https://wowsimstats.com\",\"compressHTML\":true,\"base\":\"/\",\"trail │
│ ingSlash\":\"ignore\",\"output\":\"server\",\"scopedStyleStrategy\":\"attribute\", │
│ \"build\":{\"format\":\"directory\",\"client\":{},\"server\":{},\"assets\":\"_astr │
│ o\",\"serverEntry\":\"entry.mjs\",\"redirects\":false,\"inlineStylesheets\":\"auto │
│ \",\"concurrency\":1},\"server\":{\"open\":false,\"host\":false,\"port\":26617,\"s │
│ treaming\":true,\"allowedHosts\":[]},\"redirects\":{},\"image\":{\"endpoint\":{\"r │
│ oute\":\"/_image\"},\"service\":{\"entrypoint\":\"astro/assets/services/sharp\",\" │
│ config\":{}},\"domains\":[],\"remotePatterns\":[],\"responsiveStyles\":false},\"de │
│ vToolbar\":{\"enabled\":true},\"markdown\":{\"syntaxHighlight\":{\"type\":\"shiki\ │
│ ",\"excludeLangs\":[\"math\"]},\"shikiConfig\":{\"langs\":[],\"langAlias\":{},\"th │
│ eme\":\"github-dark\",\"themes\":{},\"wrap\":false,\"transformers\":[]},\"remarkPl │
│ ugins\":[],\"rehypePlugins\":[],\"remarkRehype\":{},\"gfm\":true,\"smartypants\":t │
│ rue},\"security\":{\"checkOrigin\":true},\"env\":{\"schema\":{},\"validateSecrets\ │
│ ":false},\"experimental\":{\"clientPrerender\":false,\"contentIntellisense\":false │
│ ,\"headingIdCompat\":false,\"preserveScriptOrder\":false,\"liveContentCollections\ │
│ ":false,\"csp\":false,\"rawEnvValues\":false},\"legacy\":{\"collections\":false}}" │
│ ] │
│ \ No newline at end of file │
│ +[["Map",1,2],"meta::meta",["Map",3,4,5,6],"astro-version","5.12.0","astro-config- │
│ digest","{\"root\":{},\"srcDir\":{},\"publicDir\":{},\"outDir\":{},\"cacheDir\":{} │
│ ,\"site\":\"https://wowsimstats.com\",\"compressHTML\":true,\"base\":\"/\",\"trail │
│ ingSlash\":\"ignore\",\"output\":\"server\",\"scopedStyleStrategy\":\"attribute\", │
│ \"build\":{\"format\":\"directory\",\"client\":{},\"server\":{},\"assets\":\"_astr │
│ o\",\"serverEntry\":\"entry.mjs\",\"redirects\":false,\"inlineStylesheets\":\"auto │
│ \",\"concurrency\":1},\"server\":{\"open\":false,\"host\":false,\"port\":16651,\"s │
│ treaming\":true,\"allowedHosts\":[]},\"redirects\":{},\"image\":{\"endpoint\":{\"r │
│ oute\":\"/_image\"},\"service\":{\"entrypoint\":\"astro/assets/services/sharp\",\" │
│ config\":{}},\"domains\":[],\"remotePatterns\":[],\"responsiveStyles\":false},\"de │
│ vToolbar\":{\"enabled\":true},\"markdown\":{\"syntaxHighlight\":{\"type\":\"shiki\ │
│ ",\"excludeLangs\":[\"math\"]},\"shikiConfig\":{\"langs\":[],\"langAlias\":{},\"th │
│ eme\":\"github-dark\",\"themes\":{},\"wrap\":false,\"transformers\":[]},\"remarkPl │
│ ugins\":[],\"rehypePlugins\":[],\"remarkRehype\":{},\"gfm\":true,\"smartypants\":t │
│ rue},\"security\":{\"checkOrigin\":true},\"env\":{\"schema\":{},\"validateSecrets\ │
│ ":false},\"experimental\":{\"clientPrerender\":false,\"contentIntellisense\":false │
│ ,\"headingIdCompat\":false,\"preserveScriptOrder\":false,\"liveContentCollections\ │
│ ":false,\"csp\":false,\"rawEnvValues\":false},\"legacy\":{\"collections\":false}}" │
│ ] │
│ \ No newline at end of file │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ web/.astro/data-store.json ─────────┐
│ diff --git a/web/.astro/data-store.json b/we │
│ b/.astro/data-store.json │
│ index 50de610..20ae198 100644 │
│ --- a/web/.astro/data-store.json │
│ +++ b/web/.astro/data-store.json │
│ @@ -1 +1 @@ │
│ -[["Map",1,2],"meta::meta",["Map",3,4,5,6]," │
│ astro-version","5.12.0","astro-config-digest │
│ ","{\"root\":{},\"srcDir\":{},\"publicDir\": │
│ {},\"outDir\":{},\"cacheDir\":{},\"site\":\" │
│ https://wowsimstats.com\",\"compressHTML\":t │
│ rue,\"base\":\"/\",\"trailingSlash\":\"ignor │
│ e\",\"output\":\"server\",\"scopedStyleStrat │
│ egy\":\"attribute\",\"build\":{\"format\":\" │
│ directory\",\"client\":{},\"server\":{},\"as │
│ sets\":\"_astro\",\"serverEntry\":\"entry.mj │
│ s\",\"redirects\":false,\"inlineStylesheets\ │
│ ":\"auto\",\"concurrency\":1},\"server\":{\" │
│ open\":false,\"host\":false,\"port\":26617,\ │
│ "streaming\":true,\"allowedHosts\":[]},\"red │
│ irects\":{},\"image\":{\"endpoint\":{\"route │
│ \":\"/_image\"},\"service\":{\"entrypoint\": │
│ \"astro/assets/services/sharp\",\"config\":{ │
│ }},\"domains\":[],\"remotePatterns\":[],\"re │
│ sponsiveStyles\":false},\"devToolbar\":{\"en │
│ abled\":true},\"markdown\":{\"syntaxHighligh │
│ t\":{\"type\":\"shiki\",\"excludeLangs\":[\" │
│ math\"]},\"shikiConfig\":{\"langs\":[],\"lan │
│ gAlias\":{},\"theme\":\"github-dark\",\"them │
│ es\":{},\"wrap\":false,\"transformers\":[]}, │
│ \"remarkPlugins\":[],\"rehypePlugins\":[],\" │
│ remarkRehype\":{},\"gfm\":true,\"smartypants │
│ \":true},\"security\":{\"checkOrigin\":true} │
│ ,\"env\":{\"schema\":{},\"validateSecrets\": │
│ false},\"experimental\":{\"clientPrerender\" │
│ :false,\"contentIntellisense\":false,\"headi │
│ ngIdCompat\":false,\"preserveScriptOrder\":f │
│ alse,\"liveContentCollections\":false,\"csp\ │
│ ":false,\"rawEnvValues\":false},\"legacy\":{ │
│ \"collections\":false}}"] │
│ \ No newline at end of file │
│ +[["Map",1,2],"meta::meta",["Map",3,4,5,6]," │
│ astro-version","5.12.0","astro-config-digest │
│ ","{\"root\":{},\"srcDir\":{},\"publicDir\": │
│ {},\"outDir\":{},\"cacheDir\":{},\"site\":\" │
│ https://wowsimstats.com\",\"compressHTML\":t │
│ rue,\"base\":\"/\",\"trailingSlash\":\"ignor │
│ e\",\"output\":\"server\",\"scopedStyleStrat │
│ egy\":\"attribute\",\"build\":{\"format\":\" │
│ directory\",\"client\":{},\"server\":{},\"as │
│ sets\":\"_astro\",\"serverEntry\":\"entry.mj │
│ s\",\"redirects\":false,\"inlineStylesheets\ │
│ ":\"auto\",\"concurrency\":1},\"server\":{\" │
│ open\":false,\"host\":false,\"port\":16651,\ │
│ "streaming\":true,\"allowedHosts\":[]},\"red │
│ irects\":{},\"image\":{\"endpoint\":{\"route │
│ \":\"/_image\"},\"service\":{\"entrypoint\": │
│ \"astro/assets/services/sharp\",\"config\":{ │
│ }},\"domains\":[],\"remotePatterns\":[],\"re │
│ sponsiveStyles\":false},\"devToolbar\":{\"en │
│ abled\":true},\"markdown\":{\"syntaxHighligh │
│ t\":{\"type\":\"shiki\",\"excludeLangs\":[\" │
│ math\"]},\"shikiConfig\":{\"langs\":[],\"lan │
│ gAlias\":{},\"theme\":\"github-dark\",\"them │
│ es\":{},\"wrap\":false,\"transformers\":[]}, │
│ \"remarkPlugins\":[],\"rehypePlugins\":[],\" │
│ remarkRehype\":{},\"gfm\":true,\"smartypants │
│ \":true},\"security\":{\"checkOrigin\":true} │
│ ,\"env\":{\"schema\":{},\"validateSecrets\": │
│ false},\"experimental\":{\"clientPrerender\" │
│ :false,\"contentIntellisense\":false,\"headi │
│ ngIdCompat\":false,\"preserveScriptOrder\":f │
│ alse,\"liveContentCollections\":false,\"csp\ │
│ ":false,\"rawEnvValues\":false},\"legacy\":{ │
│ \"collections\":false}}"] │
│ \ No newline at end of file │
└──────────────────────────────────────────────┘
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET