Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync 2024 12 02 #8

Merged
merged 101 commits into from
Dec 2, 2024
Merged

Sync 2024 12 02 #8

merged 101 commits into from
Dec 2, 2024

Conversation

nstephenh
Copy link

All the updates to the main repo, rebasing the single commit in this repo on top of this. I strongly recommend just making this the new "main" instead of trying to merge this.

Mayegelt and others added 30 commits June 12, 2024 12:05
* RoW change

RoW moved from LA Lib into each legion individually without an Import flag.

* Allied Detachment Change

Rolled in a change to allied detachments to prevent issues (changed it to function like ZM detachement, rather than a new box)
Overseers should work. Though might be a bit messy as I cloned the entry rather than linked to it, as I didn't want to catalogue link to both Militia and Solar cats
A few fixes for Company Command Squad to prevent it from being taken if you include mortificator, praevaen or overseers retinue.
Still needs to have all the other retinues added to that list as you can't have more than 1.
Also fix for Blackshields as they were getting Company Command Squads as a root entry for no reason.
Not all the rites of war that were copied had the same ID. Now they do.
* Optae is compulsory HQ. Also add independent character. Fix BSData#3251

* Fix Quad Launcher Shells BSData#3249

* Removed generic warlord trait selector from knights. Fix BSData#3242

* Add flattened SSEG for Pental cohort weapons, add it to Lifewards. Fix BSData#3236

* Cortex controllers are iron cohort not solar cohort. Fix BSData#3169
* Fix Berserker on centurion (BSData#3250)

* Fix Berserker on terminator centurions and optae (BSData#3250)
* Add publication

* Remove some NBSP (unrelated)

* Add Sanguinary Guard Squad

* As a retinue choice, fix max 1 per force.

* Update books.json

* Unrelated profile order fixes
About half way down the list of complete rules and wargear.
Fixes for a load more of the typos and linebreaks. This should get the majority in rules and wargear.
* All singular conditions for movement characteristics from legions changed to condition groups that include white scars.
* Also update condition groups (White Scars Legiones Cybernetica, vorax as an example).
* Shadrak Meduson

* Fix command squad banners and special weapons.
Use links for veteran equipment.

* NBSP Stripping
BSData#3301 Keshig Lances
BSData#3123 ZM Reactions
BSData#3128 Daemons list with LoW Warlord
BSData#3112 Venerable Dreads Legion Options
reaction spelling mistake
Looks like it didn't upload. So try again.
Mayegelt and others added 21 commits October 7, 2024 07:36
Sevetars warlord trait beta fix
void shield generator Typo
Kaedes Nex hidden bug
Company Command Squad Lightning Claw fix.
Fix for NL and Sal
Fix for Company Command Squad limitations.
Fix for Arlatax weapons
Fix for default weapon on Varagyr
Fix for Castellan which shouldn't have been allowed in Blackshields.
Fix for Abaddon banestrike combi bolter
Company Command and a few other fixes
The Augury Scanner, Nuncio and Banners ended up falling off accidently in the rework.
Fix for the Fix for Company Command Squad
Copy link

@LeonisAstra LeonisAstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. The only change is to get things to match the current edition of the HH repo.

However, the Game ID change hasn't propagated to all of the libraries as said by the last commit. Probably need to get that done really quick before changing this to the new main.

@nstephenh
Copy link
Author

However, the Game ID change hasn't propagated to all of the libraries as said by the last commit. Probably need to get that done really quick before changing this to the new main.

There isn't a game ID change in here, I haven't done one yet.

@ZagreusKane
Copy link

ZagreusKane commented Dec 2, 2024

Edit: I can't read, yes it does

# Conflicts:
#	2022 - Horus Heresy.gst
@nstephenh nstephenh requested a review from LeonisAstra December 2, 2024 18:54
@ZagreusKane ZagreusKane merged commit 832df7d into main Dec 2, 2024
2 checks passed
@ZagreusKane ZagreusKane deleted the Sync-2024-12-02 branch December 2, 2024 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants