#11 gestion encombrement et malus associé

This commit is contained in:
sladecraven 2020-11-12 14:44:42 +01:00
parent ea821e352e
commit 3b82817d91
2 changed files with 2 additions and 5 deletions

View File

@ -162,9 +162,8 @@ export class RdDUtility {
return loadTemplates(templatePaths); return loadTemplates(templatePaths);
} }
<<<<<<< HEAD
/************************************************************************************/ /* -------------------------------------------- */
static buildConteneur( objet, niveau ) { static buildConteneur( objet, niveau ) {
if (!niveau) niveau = 1; if (!niveau) niveau = 1;
let prefix = ""; let prefix = "";
@ -212,8 +211,6 @@ export class RdDUtility {
} }
return tableRes; return tableRes;
} }
=======
>>>>>>> fb52e394e7e17fad20a0bdaa2ae9ea00c03a465e
/* -------------------------------------------- */ /* -------------------------------------------- */
static getLevelCategory( ) static getLevelCategory( )

View File

@ -5,7 +5,7 @@
"version": "0.9.32", "version": "0.9.32",
"minimumCoreVersion": "0.7.5", "minimumCoreVersion": "0.7.5",
"compatibleCoreVersion": "0.7.6", "compatibleCoreVersion": "0.7.6",
"templateVersion": 43, "templateVersion": 44,
"author": "LeRatierBretonnien", "author": "LeRatierBretonnien",
"esmodules": [ "module/rdd-main.js", "module/hook-renderChatLog.js" ], "esmodules": [ "module/rdd-main.js", "module/hook-renderChatLog.js" ],
"styles": ["styles/simple.css"], "styles": ["styles/simple.css"],