FyloZ 9fa96adda8 Merge branch 'master' of https://git.fyloz.dev/FyloZ/color-recipes-explorer ... Conflicts: src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/configuration/InitialDataLoader.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/model/Material.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/model/MaterialType.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/model/Recipe.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/services/model/MaterialService.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/services/model/MaterialTypeService.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/core/services/model/MixService.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/WebsitePaths.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/InventoryController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/OthersController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/RecipeExplorerController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/creators/CompanyCreatorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/creators/MaterialCreatorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/creators/MixCreatorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/editors/MaterialEditorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/editors/MaterialTypeEditorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/editors/MixEditorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/editors/RecipeEditorController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/ImageFilesController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/files/SIMDUTFilesController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialRemoverController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/MaterialTypeRemoverController.java src/main/java/dev/fyloz/trial/colorrecipesexplorer/web/controller/removers/RecipeRemoverController.java src/main/resources/templates/index.html src/main/resources/templates/material/creator.html src/main/resources/templates/material/edit.html src/main/resources/templates/material/editor.html src/main/resources/templates/material/remover.html src/main/resources/templates/materialType/edit.html src/main/resources/templates/materialType/editor.html src/main/resources/templates/mix/editor.html src/main/resources/templates/mix/selector.html src/main/resources/templates/recipe/bak.html src/main/resources/templates/recipe/created.html src/main/resources/templates/recipe/edit.html src/main/resources/templates/recipe/editor.html src/main/resources/templates/recipe/explore.html src/main/resources/templates/recipe/remover.html		2020-02-16 15:05:25 -05:00
..
fonts	# v1.2.0 (Imprimante P-touch)	2020-01-29 20:48:25 -05:00
lang	# v1.2.0 (Imprimante P-touch)	2020-01-29 20:48:25 -05:00
META-INF	v1.1.1	2019-12-08 15:10:23 -05:00
static	# v1.2.0 (Imprimante P-touch)	2020-01-29 20:48:25 -05:00
templates	Merge branch 'master' of https://git.fyloz.dev/FyloZ/color-recipes-explorer	2020-02-16 15:05:25 -05:00
application.yml	Merge branch 'master' of https://git.fyloz.dev/FyloZ/color-recipes-explorer	2020-02-16 15:05:25 -05:00
logback.xml	v1.1.1	2019-12-08 15:10:23 -05:00
updates.md	# v1.2.0 (Imprimante P-touch)	2020-01-29 20:48:25 -05:00