mirror of
https://github.com/exituser/Brewery.git
synced 2026-09-17 07:49:03 +00:00
Some more merge fixes
This commit is contained in:
@@ -46,6 +46,7 @@ public class Brew {
|
||||
|
||||
public Brew(BIngredients ingredients) {
|
||||
this.ingredients = ingredients;
|
||||
touch();
|
||||
}
|
||||
|
||||
// quality already set
|
||||
@@ -53,6 +54,7 @@ public class Brew {
|
||||
this.ingredients = ingredients;
|
||||
this.quality = quality;
|
||||
this.currentRecipe = recipe;
|
||||
touch();
|
||||
}
|
||||
|
||||
// loading with all values set
|
||||
|
||||
Reference in New Issue
Block a user