merging 72-implement-area, including core refactor

pixelaw · Oct 20, 2024 · a9ad2e7 · a9ad2e7
1 parent cddf99d
commit a9ad2e7
Show file tree

Hide file tree

Showing 102 changed files with 29,319 additions and 1,578 deletions.
diff --git a/contracts/.tool-versions b/contracts/.tool-versions
@@ -1,2 +1,2 @@
-dojo 1.0.0-alpha.11
+dojo 1.0.0-alpha.16
 scarb 2.7.0
diff --git a/contracts/Scarb.lock b/contracts/Scarb.lock
@@ -4,15 +4,7 @@ version = 1
 [[package]]
 name = "dojo"
 version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.11#fbff45b249e2b931f5007edf2d526beef7dc553f"
-dependencies = [
- "dojo_plugin",
-]
-
-[[package]]
-name = "dojo_plugin"
-version = "1.0.0-alpha.4"
-source = "git+https://github.com/dojoengine/dojo?rev=f15def33#f15def330c0d099e79351d11c197f63e8cc1ff36"
+source = "git+https://github.com/dojoengine/dojo?tag=v1.0.0-alpha.16#3b3a78cd8239ca2ee524c49c83f36db4d79cb4bc"
 
 [[package]]
 name = "pixelaw"

diff --git a/contracts/Scarb.toml b/contracts/Scarb.toml
@@ -9,7 +9,7 @@ edition = "2024_07"
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.11" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.16" }
 
 [tool.fmt]
 sort-module-level-items = true

diff --git a/contracts/Scarb_deploy.toml b/contracts/Scarb_deploy.toml
@@ -9,7 +9,7 @@ edition = "2024_07"
 sierra-replace-ids = true
 
 [dependencies]
-dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.11" }
+dojo = { git = "https://github.com/dojoengine/dojo", tag = "v1.0.0-alpha.16" }
 
 [tool.fmt]
 sort-module-level-items = true

diff --git a/contracts/dojo_dev.toml b/contracts/dojo_dev.toml
@@ -11,4 +11,4 @@ mappings = {}
 rpc_url = "http://localhost:5050/"
 account_address = "0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca"
 private_key = "0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a"
-world_address = "0x263ae44e5414519a5c5a135cccaf3d9d7ee196d37e8de47a178da91f3de9b34"
+world_address = "0x4adbe4bfe631a95a5ce99d8200a8721b1ac8096ff8941cecddc4e79a7b2d5d5"