Merge branch 'release/0.5.3'

sithis993 · Jul 20, 2020 · 9b81a8a · 9b81a8a
2 parents f483d93 + 13b36b5
commit 9b81a8a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+# Custom ignores
+TODO.txt
+
 # User-specific files
 *.suo
 *.user

diff --git a/MealCalculator/CMealCalculatorFrame.cpp b/MealCalculator/CMealCalculatorFrame.cpp
@@ -166,12 +166,6 @@ CIngredient* CMealCalculatorFrame::getCurrentIngredient()
 		return ingredient;
 	}
 
-	if (calories == 0.0)
-	{
-		showError("Ingredient calories must be a number greater than zero");
-		return ingredient;
-	}
-
 	ingredient = new CIngredient(
 		name,
 		brand,

diff --git a/MealCalculator/Version.h b/MealCalculator/Version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STRING "0.5.2"
+#define VERSION_STRING "0.5.3"