Skip to content

Commit

Permalink
Merge pull request #19 from anno-mods/devel/1.9
Browse files Browse the repository at this point in the history
add loader 10 features, localization helpers and GUID decorations
  • Loading branch information
jakobharder authored Mar 20, 2023
2 parents c3cc8d2 + 2d1d3bb commit e7eb597
Show file tree
Hide file tree
Showing 20 changed files with 8,591 additions and 7,896 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ external/*

# to be removed eventually
!external/AnnoFCConverter.exe
!external/annodiff.exe
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ All notable changes to the "anno-modding-tools" extension will be documented in

Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.

## [Unreleased]

## [1.9.0]

- Support loader 10 features (i.e. Group, Condition, ...)
- Added inline GUID decoration with name and template
- Added `Anno: Find Missing Text`
- Added `Anno: Update Missing Text from English`
- Added file checks for `IconFilename`, `Filename` and `FileName`
- Compare with Vanilla: support `templates.xml` and `texts_*.xml`
- Buildmod: read `base64.jpg` as base64 image into `modinfo.json`

## [1.8.0]
Expand Down
Binary file added external/annodiff.exe
Binary file not shown.
16 changes: 15 additions & 1 deletion generated/assets.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -84012,7 +84012,6 @@
<xs:element name='ignore' minOccurs='0' maxOccurs='1'>
<xs:complexType>
<xs:sequence>
<xs:any processContents='skip' minOccurs='0' maxOccurs='unbounded' />
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down Expand Up @@ -94606,12 +94605,23 @@
<xs:choice maxOccurs="unbounded">
<xs:element name='Include' type='Include' />
<xs:element name='ModOp' type='ModOp' />
<xs:element name='Group' type='Group' />
<xs:element name='ImyaTweaks' type='ImyaTweaks' />
<xs:element name='ImyaExpose' type='ImyaExpose' />
</xs:choice>
</xs:complexType>
</xs:element>

<xs:complexType name='Group'>
<xs:choice maxOccurs="unbounded">
<xs:element name='Include' type='Include' />
<xs:element name='ModOp' type='ModOp' />
<xs:element name='Group' type='Group' />
</xs:choice>
<xs:attribute name='Condition' type='xs:string' />
<xs:attribute name='Skip' type='ModOpSkip' />
</xs:complexType>

<xs:complexType name='ModOp'>
<xs:sequence>
<xs:element name='Asset' type='Asset' minOccurs='0' maxOccurs='unbounded' />
Expand All @@ -94622,10 +94632,14 @@
<xs:attribute name='Path' type='xs:string' />
<xs:attribute name='ModOpID' type='xs:string' />
<xs:attribute name='Skip' type='ModOpSkip' />
<xs:attribute name='Condition' type='xs:string' />
<xs:attribute name='AllowNoMatch' type='ModOpSkip' />
<xs:attribute name='Content' type='xs:string' />
</xs:complexType>

<xs:complexType name='Include'>
<xs:attribute name='File' type='xs:string' use='required' />
<xs:attribute name='Skip' type='ModOpSkip' />
</xs:complexType>

<xs:complexType name='ImyaTweaks'>
Expand Down
15 changes: 15 additions & 0 deletions generated/assets.xsd.custom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@
<xs:choice maxOccurs="unbounded">
<xs:element name='Include' type='Include' />
<xs:element name='ModOp' type='ModOp' />
<xs:element name='Group' type='Group' />
<xs:element name='ImyaTweaks' type='ImyaTweaks' />
<xs:element name='ImyaExpose' type='ImyaExpose' />
</xs:choice>
</xs:complexType>
</xs:element>

<xs:complexType name='Group'>
<xs:choice maxOccurs="unbounded">
<xs:element name='Include' type='Include' />
<xs:element name='ModOp' type='ModOp' />
<xs:element name='Group' type='Group' />
</xs:choice>
<xs:attribute name='Condition' type='xs:string' />
<xs:attribute name='Skip' type='ModOpSkip' />
</xs:complexType>

<xs:complexType name='ModOp'>
<xs:sequence>
<xs:element name='Asset' type='Asset' minOccurs='0' maxOccurs='unbounded' />
Expand All @@ -19,10 +30,14 @@
<xs:attribute name='Path' type='xs:string' />
<xs:attribute name='ModOpID' type='xs:string' />
<xs:attribute name='Skip' type='ModOpSkip' />
<xs:attribute name='Condition' type='xs:string' />
<xs:attribute name='AllowNoMatch' type='ModOpSkip' />
<xs:attribute name='Content' type='xs:string' />
</xs:complexType>

<xs:complexType name='Include'>
<xs:attribute name='File' type='xs:string' use='required' />
<xs:attribute name='Skip' type='ModOpSkip' />
</xs:complexType>

<xs:complexType name='ImyaTweaks'>
Expand Down
Loading

0 comments on commit e7eb597

Please sign in to comment.