Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/BSData/wh40k
Browse files Browse the repository at this point in the history
  • Loading branch information
FarseerVeraenthis committed Jul 18, 2018
2 parents 5a0ea22 + 3f9c562 commit be61124
Show file tree
Hide file tree
Showing 18 changed files with 4,640 additions and 1,836 deletions.
35 changes: 35 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This is a reference script - it should be saved as 'appveyor.yml' in repo root.

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Please fill 'version' property with a version string you want appended with `.{build}` #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

version: 'v1.1.50.{build}'
image: Visual Studio 2017
environment:
github_auth_token: # this is BSData-bot encrypted OAuth token
secure: O02JLN8Q1/zGJDgSkd2GmYNN6qO3hMspj3N6F8db7Fkx+/EQxjJ9tjJdJs6OpwAp
install:
- ps: |
$install_script_url = 'https://raw.githubusercontent.com/BSData/catalogue-development/master/scripts/appveyor-ci-install-script-v1.0.ps1'
(New-Object System.Net.WebClient).DownloadString($install_script_url) | iex
build_script:
- ps: |
$build_script_url = 'https://raw.githubusercontent.com/BSData/catalogue-development/master/scripts/appveyor-ci-build-script-v1.0.ps1'
(New-Object System.Net.WebClient).DownloadString($build_script_url) | iex
test_script:
- ps: |
$test_script_url = 'https://raw.githubusercontent.com/BSData/catalogue-development/master/scripts/appveyor-ci-test-script-v1.0.ps1'
(New-Object System.Net.WebClient).DownloadString($test_script_url) | iex
deploy_script:
- ps: |
$deploy_script_url = 'https://raw.githubusercontent.com/BSData/catalogue-development/master/scripts/appveyor-ci-deploy-script-v1.0.ps1'
(New-Object System.Net.WebClient).DownloadString($deploy_script_url) | iex
artifacts:
- path: 'artifacts\*.bsi'
- path: 'artifacts\*.bsr'
notifications:
- provider: Webhook
url: https://webhooks.gitter.im/e/fe58f08211387ed8cc96 # here paste your Gitter chatroom Webhook url :)
on_build_success: true
on_build_failure: true
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
!*.gst

# Don't ignore docs
!*.md
!*.md
DWHRCustom.cat
18 changes: 13 additions & 5 deletions Aeldari - Drukhari.cat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<catalogue id="e0a4-2172-4397-e39a" name="Aeldari - Drukhari" book="Codex: Drukahri" revision="33" battleScribeVersion="2.01" authorName="WindstormSCR" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<catalogue id="e0a4-2172-4397-e39a" name="Aeldari - Drukhari" book="Codex: Drukahri" revision="34" battleScribeVersion="2.01" authorName="WindstormSCR" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
<profiles/>
<rules/>
<infoLinks>
Expand Down Expand Up @@ -5235,13 +5235,13 @@
</categoryLinks>
<selectionEntries/>
<selectionEntryGroups>
<selectionEntryGroup id="b3da-8fc1-3247-3f47" name="3 - 12 Razorwing flocks" hidden="false" collective="false" defaultSelectionEntryId="035c-2cf2-b876-7f76">
<selectionEntryGroup id="b3da-8fc1-3247-3f47" name="1 - 12 Razorwing flocks" hidden="false" collective="false" defaultSelectionEntryId="035c-2cf2-b876-7f76">
<profiles/>
<rules/>
<infoLinks/>
<modifiers/>
<constraints>
<constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5cdd-9819-71be-950e" type="min"/>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5cdd-9819-71be-950e" type="min"/>
<constraint field="selections" scope="parent" value="12.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6337-2576-144f-ba92" type="max"/>
</constraints>
<categoryLinks/>
Expand Down Expand Up @@ -5270,7 +5270,7 @@
<infoLinks/>
<modifiers/>
<constraints>
<constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="357e-6308-cde7-01d6" type="min"/>
<constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="357e-6308-cde7-01d6" type="min"/>
<constraint field="selections" scope="parent" value="12.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e78e-2ce6-b483-3b63" type="max"/>
</constraints>
<categoryLinks/>
Expand Down Expand Up @@ -5656,7 +5656,7 @@
</entryLink>
</entryLinks>
</selectionEntryGroup>
<selectionEntryGroup id="93a5-d27c-615a-ded9" name="Replace Monstrous Cleaver with Weapon of Torture" hidden="false" collective="false">
<selectionEntryGroup id="93a5-d27c-615a-ded9" name="Replace Monstrous Cleaver" hidden="false" collective="false">
<profiles/>
<rules/>
<infoLinks/>
Expand Down Expand Up @@ -5712,6 +5712,14 @@
</constraints>
<categoryLinks/>
</entryLink>
<entryLink id="05e5-98e4-73cf-9cc0" name="Liquifier Gun" hidden="false" targetId="741f-a9d5-adc0-b2dc" type="selectionEntry">
<profiles/>
<rules/>
<infoLinks/>
<modifiers/>
<constraints/>
<categoryLinks/>
</entryLink>
</entryLinks>
</selectionEntryGroup>
</selectionEntryGroups>
Expand Down
Loading

0 comments on commit be61124

Please sign in to comment.