Merge branch 'master' into baldera

This commit is contained in:
Archgeus
2025-03-16 20:46:40 -04:00
2 changed files with 3327 additions and 7 deletions

View File

@@ -17,11 +17,12 @@
-->
<Item slotPos="1" itemTemplateId="166619" initItemAmount="6" coolTimeMiliSecond="600000" />
<Item slotPos="2" itemTemplateId="166639" needSpecialProcess="false" initItemAmount="6" coolTimeMiliSecond="600000" />
<Item slotPos="3" itemTemplateId="166707" initItemAmount="6" coolTimeMiliSecond="600000" giveItemTemplateId="" />
<Item slotPos="4" itemTemplateId="166710" initItemAmount="6" coolTimeMiliSecond="600000" giveItemTemplateId="" />
<Item slotPos="5" itemTemplateId="181116" initItemAmount="1" coolTimeMiliSecond="0" giveItemTemplateId="" giveItemAmount="1" needSpecialProcess="true" />
<Item slotPos="6" itemTemplateId="181117" initItemAmount="1" coolTimeMiliSecond="0" giveItemTemplateId="" giveItemAmount="1" needSpecialProcess="true" />
<Item slotPos="7" itemTemplateId="169660" initItemAmount="1" coolTimeMiliSecond="600000" giveItemTemplateId="214486" giveItemAmount="1" />
<Item slotPos="8" itemTemplateId="182916" initItemAmount="1" giveItemTemplateId="214480" giveItemAmount="1" coolTimeMiliSecond="0" />
<!-- <Item slotPos="3" itemTemplateId="166707" initItemAmount="6" coolTimeMiliSecond="600000" giveItemTemplateId="" />
<Item slotPos="4" itemTemplateId="166710" initItemAmount="6" coolTimeMiliSecond="600000" giveItemTemplateId="" /> -->
<Item slotPos="3" itemTemplateId="181116" initItemAmount="1" coolTimeMiliSecond="0" giveItemTemplateId="" giveItemAmount="1" needSpecialProcess="true" />
<Item slotPos="4" itemTemplateId="181117" initItemAmount="1" coolTimeMiliSecond="0" giveItemTemplateId="" giveItemAmount="1" needSpecialProcess="true" />
<Item slotPos="5" itemTemplateId="180675" initItemAmount="1" coolTimeMiliSecond="600000" giveItemTemplateId="180676" giveItemAmount="1" />
<Item slotPos="6" itemTemplateId="169660" initItemAmount="1" coolTimeMiliSecond="600000" giveItemTemplateId="214486" giveItemAmount="1" />
<Item slotPos="7" itemTemplateId="182916" initItemAmount="1" giveItemTemplateId="214480" giveItemAmount="1" coolTimeMiliSecond="0" />
</ResetInven>
</InvenForPCBang>

File diff suppressed because it is too large Load Diff