Merge branch 'main' into draft

LizBonn · Feb 28, 2025 · 14a82f7 · 14a82f7
2 parents 11f7cfa + 6035593
commit 14a82f7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
         run: zip game.zip * .lake/ .i18n/ -r
 
       - name: upload compressed game folder
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-for-server-import
           path: |

diff --git a/.github/workflows/build_blueprint.yml b/.github/workflows/build_blueprint.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: DeterminateSystems/flake-checker-action@main
       - name: Checkout Project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
           lfs: true

diff --git a/Game/Levels/World_three.lean b/Game/Levels/World_three.lean
@@ -1,4 +1,4 @@
-import Game.Levels.World_three.L01_injective_definition
+import Game.Levels.World_three.L01_injective_defintion
 import Game.Levels.World_three.L02_injective_composition
 import Game.Levels.World_three.L03_surjective_definition
 import Game.Levels.World_three.L04_surjective_composition

diff --git a/RubikCubeGame/World_2.lean b/RubikCubeGame/World_2.lean
@@ -62,7 +62,7 @@ example {G : Type*} [Group G] (H : Subgroup G) {x y : G} (hx : x ∈ H) (hy : y
   exact hy
 
 -- Level 11. Intersection of subgroups is a subgroup.
-example {G : Type*} [Group G] (H₁ : Subgroup G) (H₂ : Subgroup G) : Subgroup G := {
+example {G : Type*} [Group G] (H₁ : Subgroup G) (H₂ : Subgroup G) : Subgroup G where
   carrier := H₁.carrier ∩ H₂.carrier
   mul_mem' := by
     intro x y ⟨hx₁, hx₂⟩ ⟨hy₁, hy₂⟩
@@ -73,7 +73,6 @@ example {G : Type*} [Group G] (H₁ : Subgroup G) (H₂ : Subgroup G) : Subgroup
     exact ⟨H₁.one_mem, H₂.one_mem⟩
   inv_mem' := by
     simp
-}
 
 def evens : Set ℕ :=
   { n | Even n }