Merge branch 'storyline/s2e0' into yubo

5 years ago · b869cd07d6
parent a7d2175f93 6747613b03
commit b869cd07d6
2 changed files with 2 additions and 0 deletions
--- a/code/ryzom/common/src/game_share/brick_families.cpp
+++ b/code/ryzom/common/src/game_share/brick_families.cpp
@ -549,6 +549,7 @@ namespace BRICK_FAMILIES
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBP)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBR)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMBS)
+		NL_STRING_CONVERSION_TABLE_ENTRY(BSGMC)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSMMA)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSMMB)
 		NL_STRING_CONVERSION_TABLE_ENTRY(BSMMC)
--- a/code/ryzom/common/src/game_share/brick_families.h
+++ b/code/ryzom/common/src/game_share/brick_families.h
@ -660,6 +660,7 @@ namespace BRICK_FAMILIES
 					BSGMBP,
 					BSGMBR,
 					BSGMBS,
+				BSGMC, // jewels s2e0

 				BeginMagicPowerParameter,
 				BSMMA = BeginMagicPowerParameter, // sap aura