Update branch + fix merge conflicts

modrinth · Mar 30, 2024 · 9ed8612 · 9ed8612
2 parents 53b0601 + 0a0837e
commit 9ed8612
Show file tree

Hide file tree

Showing 109 changed files with 3,985 additions and 2,822 deletions.
diff --git a/.env b/.env
@@ -98,3 +98,5 @@ CLICKHOUSE_DATABASE=staging_ariadne
 MAXMIND_LICENSE_KEY=none
 
 PAYOUTS_BUDGET=100
+
+FLAME_ANVIL_URL=none
diff --git a/...f1c352857cf2eb15874cee9d31f8d992ab77.json → ...86e7460a6ff7b03cbc90939ac6c7cb526433.json b/...f1c352857cf2eb15874cee9d31f8d992ab77.json → ...86e7460a6ff7b03cbc90939ac6c7cb526433.json
diff --git a/.sqlx/query-070174adf972b808aca7519168719e6c7b762bfbcc09d8ab2624b00113f71e77.json b/.sqlx/query-070174adf972b808aca7519168719e6c7b762bfbcc09d8ab2624b00113f71e77.json
diff --git a/.sqlx/query-10279b5a8383ba8e286f1bfb9a486e3f8b362c46cfc2647c90a83a10e5329569.json b/.sqlx/query-10279b5a8383ba8e286f1bfb9a486e3f8b362c46cfc2647c90a83a10e5329569.json
diff --git a/...57654ede51e944944d4af59fe1ba1f6a336e.json → ...ccecfd09d877e84f3fbe5cd190dd69d3b7e1.json b/...57654ede51e944944d4af59fe1ba1f6a336e.json → ...ccecfd09d877e84f3fbe5cd190dd69d3b7e1.json
diff --git a/...f66f60524ec13eab7d922db9290237297849.json → ...30ead9fe7883d283e08a46155382e7a6c163.json b/...f66f60524ec13eab7d922db9290237297849.json → ...30ead9fe7883d283e08a46155382e7a6c163.json
diff --git a/.sqlx/query-3151ef71738a1f0d097aa14967d7b9eb1f24d4de1f81b80c4bd186427edc1399.json b/.sqlx/query-3151ef71738a1f0d097aa14967d7b9eb1f24d4de1f81b80c4bd186427edc1399.json
diff --git a/.sqlx/query-32f4aa1ab67fbdcd7187fbae475876bf3d3225ca7b4994440a67cbd6a7b610f6.json b/.sqlx/query-32f4aa1ab67fbdcd7187fbae475876bf3d3225ca7b4994440a67cbd6a7b610f6.json
diff --git a/...b0bd68ce37f3c7cf0356d565c23520988816.json → ...e4d0b70b92c8ab9a75afb96297748ec36bd4.json b/...b0bd68ce37f3c7cf0356d565c23520988816.json → ...e4d0b70b92c8ab9a75afb96297748ec36bd4.json
diff --git a/.sqlx/query-3c875a8a1c03432f258040c436e19dbab6e78bd1789dc70f445578c779c7b995.json b/.sqlx/query-3c875a8a1c03432f258040c436e19dbab6e78bd1789dc70f445578c779c7b995.json
diff --git a/.sqlx/query-49813a96f007216072d69468aae705d73d5b85dcdd64a22060009b12d947ed5a.json b/.sqlx/query-49813a96f007216072d69468aae705d73d5b85dcdd64a22060009b12d947ed5a.json
diff --git a/.sqlx/query-4cb9fe3dbb2cbfe30a49487f896fb7890f726af2ff11da53f450a88c3dc5fc64.json b/.sqlx/query-4cb9fe3dbb2cbfe30a49487f896fb7890f726af2ff11da53f450a88c3dc5fc64.json
diff --git a/...93a23895e6b10a4eb34aa761d29acfa24fb0.json → ...11742a5f98453942fe83e09c2056bda401f4.json b/...93a23895e6b10a4eb34aa761d29acfa24fb0.json → ...11742a5f98453942fe83e09c2056bda401f4.json
diff --git a/.sqlx/query-520b6b75e79245e9ec19dbe5c30f041d8081eb317a21b122c0d61d7b13f58072.json b/.sqlx/query-520b6b75e79245e9ec19dbe5c30f041d8081eb317a21b122c0d61d7b13f58072.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -98,3 +98,5 @@ CLICKHOUSE_DATABASE=staging_ariadne
		MAXMIND_LICENSE_KEY=none

		PAYOUTS_BUDGET=100

		FLAME_ANVIL_URL=none