tf you mean dev and main are 43 commits different?

.clang-format

@@ -1,13 +1,15 @@
 ---
 Language: Cpp
 BasedOnStyle: Microsoft
-UseTab: Always
+UseTab: ForIndentation
+TabWidth: 4
 SortIncludes: false
 ReflowComments: false
 AllowShortFunctionsOnASingleLine: false
 BinPackParameters: true
 BinPackArguments: true
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
-AlignArrayOfStructures: None
-BreakArrays: false
+AlignArrayOfStructures: Left
+Cpp11BracedListStyle: false
+ColumnLimit: 0

.gitignore

@@ -8,8 +8,7 @@ out/
 crash.txt
 
 Export/
-assets/base
-/assets/main.pak
+
 /pseudocode
 /vcpkg_installed
 /android

CMakeLists.txt

@@ -23,8 +23,8 @@ if(MSVC AND GITHUB_ACTIONS)
     add_link_options(/SAFESEH:NO)
 endif()
 
-set(CMAKE_C_STANDARD 17)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_C_STANDARD 23)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 

src/Lawn/CursorObject.cpp

@@ -43,11 +43,11 @@ void CursorObject::Update()
 		return;
 	}
 
-	if (!mApp->mWidgetManager->mMouseIn 
-#if LAWN_USE_UNFINISHED_GAMEPAD_SUPPORT 
-		&& !mApp->UsingGamepad()
+	if (!mApp->mWidgetManager->mMouseIn
+#if LAWN_USE_UNFINISHED_GAMEPAD_SUPPORT
+	    && !mApp->UsingGamepad()
 #endif
-		)
+	)
 	{
 		mVisible = false;
 		return;
@@ -149,7 +149,7 @@ void CursorObject::Draw(Graphics *g)
 		Plant *aPlant = mBoard->mPlants.DataArrayGet((unsigned int)mGlovePlantID);
 		PottedPlant *aPottedPlant = &mApp->mPlayerInfo->mPottedPlant[aPlant->mPottedPlantIndex];
 		if (mBoard->mBackground == BackgroundType::BACKGROUND_MUSHROOM_GARDEN ||
-			mBoard->mBackground == BackgroundType::BACKGROUND_ZOMBIQUARIUM)
+		    mBoard->mBackground == BackgroundType::BACKGROUND_ZOMBIQUARIUM)
 		{
 			mApp->mZenGarden->DrawPottedPlant(g, -10.0f, -10.0f, aPottedPlant, 1.0f, false);
 		}
@@ -164,7 +164,7 @@ void CursorObject::Draw(Graphics *g)
 	case CursorType::CURSOR_TYPE_PLANT_FROM_WHEEL_BARROW: {
 		PottedPlant *aPottedPlant = mApp->mZenGarden->GetPottedPlantInWheelbarrow();
 		if (mBoard->mBackground == BackgroundType::BACKGROUND_MUSHROOM_GARDEN ||
-			mBoard->mBackground == BackgroundType::BACKGROUND_ZOMBIQUARIUM)
+		    mBoard->mBackground == BackgroundType::BACKGROUND_ZOMBIQUARIUM)
 		{
 			mApp->mZenGarden->DrawPottedPlant(g, -10.0f, -10.0f, aPottedPlant, 1.0f, false);
 		}
@@ -253,7 +253,7 @@ void CursorPreview::Update()
 		else if (mBoard->mCursorObject->mCursorType == CursorType::CURSOR_TYPE_WHEEELBARROW)
 		{
 			if (mApp->mZenGarden->GetPottedPlantInWheelbarrow() &&
-				mBoard->CanPlantAt(mGridX, mGridY, aSeedType) == PlantingReason::PLANTING_OK)
+			    mBoard->CanPlantAt(mGridX, mGridY, aSeedType) == PlantingReason::PLANTING_OK)
 			{
 				aShow = true;
 			}
@@ -282,22 +282,22 @@ void CursorPreview::Draw(Graphics *g)
 
 	PottedPlant *aPottedPlant = nullptr;
 	if (mBoard->mCursorObject->mCursorType == CursorType::CURSOR_TYPE_WHEEELBARROW ||
-		mBoard->mCursorObject->mCursorType == CursorType::CURSOR_TYPE_PLANT_FROM_WHEEL_BARROW)
+	    mBoard->mCursorObject->mCursorType == CursorType::CURSOR_TYPE_PLANT_FROM_WHEEL_BARROW)
 	{
 		aPottedPlant = mApp->mZenGarden->GetPottedPlantInWheelbarrow();
 	}
 	else if (mBoard->mCursorObject->mCursorType == CursorType::CURSOR_TYPE_PLANT_FROM_GLOVE)
 	{
 		aPottedPlant =
-			&mApp->mPlayerInfo->mPottedPlant
-				 [mBoard->mPlants.DataArrayGet((unsigned int)mBoard->mCursorObject->mGlovePlantID)->mPottedPlantIndex];
+		    &mApp->mPlayerInfo->mPottedPlant
+		         [mBoard->mPlants.DataArrayGet((unsigned int)mBoard->mCursorObject->mGlovePlantID)->mPottedPlantIndex];
 	}
 
 	if (aPottedPlant)
 	{
 		bool aDrawPot = true;
 		if (mBoard->mBackground == BackgroundType::BACKGROUND_MUSHROOM_GARDEN ||
-			mBoard->mBackground == BackgroundType::BACKGROUND_ZOMBIQUARIUM)
+		    mBoard->mBackground == BackgroundType::BACKGROUND_ZOMBIQUARIUM)
 		{
 			aDrawPot = false;
 		}
@@ -324,11 +324,11 @@ void CursorPreview::Draw(Graphics *g)
 		}
 
 		Plant::DrawSeedType(g,
-							mBoard->mCursorObject->mType,
-							mBoard->mCursorObject->mImitaterType,
-							DrawVariation::VARIATION_NORMAL,
-							aOffsetX,
-							aOffsetY);
+		                    mBoard->mCursorObject->mType,
+		                    mBoard->mCursorObject->mImitaterType,
+		                    DrawVariation::VARIATION_NORMAL,
+		                    aOffsetX,
+		                    aOffsetY);
 	}
 
 	if (mApp->mGameMode == GameMode::GAMEMODE_CHALLENGE_COLUMN)
@@ -339,11 +339,11 @@ void CursorPreview::Draw(Graphics *g)
 			{
 				float aOffsetY = 85.0f * (y - mGridY) + PlantDrawHeightOffset(mBoard, nullptr, aSeedType, mGridX, y);
 				Plant::DrawSeedType(g,
-									mBoard->mCursorObject->mType,
-									mBoard->mCursorObject->mImitaterType,
-									DrawVariation::VARIATION_NORMAL,
-									0.0f,
-									aOffsetY);
+				                    mBoard->mCursorObject->mType,
+				                    mBoard->mCursorObject->mImitaterType,
+				                    DrawVariation::VARIATION_NORMAL,
+				                    0.0f,
+				                    aOffsetY);
 			}
 		}
 	}