Skip to content

Commit

Permalink
Merge branch 'main' into folder-reorganisation
Browse files Browse the repository at this point in the history
  • Loading branch information
he3als committed Jun 13, 2024
2 parents 3fcf028 + cfb2416 commit ffab734
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
### Questions
- [ ] Did you test your changes or double check that they work?
- [ ] Did you test your changes or double-check that they work?
- [ ] Did you read and follow the [Atlas Contribution Guidelines](https://docs.atlasos.net/contributions/)?
- [ ] Did you commit to the [`dev`](https://github.com/Atlas-OS/Atlas/tree/dev) branch and not [`main`](https://github.com/Atlas-OS/Atlas)?

### Describe your pull request

2 changes: 1 addition & 1 deletion .github/workflows/apbx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
echo "Making a renamed password protected (malte) ZIP of playbook files..."
$pbName = "Atlas Playbook $($env:GITHUB_SHA.Substring(0,8))"
& ..\local-build.ps1 -ReplaceOldPlaybook -AddLiveLog -Removals Verification, WinverRequirement -FileName $pbName
echo "Move the .abpx playbook into 'Release ZIP' to be released as an artifact with the additional files..."
echo "Move the .apbx playbook into 'Release ZIP' to be released as an artifact with the additional files..."
Move-Item "$pbName.apbx" "../release-zip"
working-directory: src\playbook

Expand Down
2 changes: 1 addition & 1 deletion src/local-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $apbxFileName = "$fileName.apbx"
function GetNewName {
while (Test-Path -Path $apbxFileName) {
$num++
$script:apbxFileName = "$fileName ($num).abpx"
$script:apbxFileName = "$fileName ($num).apbx"
}
}
if ($replaceOldPlaybook -and (Test-Path -Path $apbxFileName)) {
Expand Down
1 change: 0 additions & 1 deletion src/playbook/Configuration/tweaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ tasks:
- tweaks\qol\shell\show-more-pins.yml
- tweaks\qol\shell\no-recommendations-start-menu.yml
- tweaks\qol\shell\disable-nearby-sharing.yml
- tweaks\qol\shell\disallow-edge-swipe.yml

# -------------------------------------------------------------------------- #
# qol\startup-shutdown #
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,22 @@ actions:
value: 'Flags'
data: '0'
type: REG_DWORD

# Disable language bar shortcuts
- !registryKey:
path: 'HKCU\Control Panel\Input Method\Hot Keys\00000104'
- !registryValue:
path: 'HKCU\Keyboard Layout\Toggle'
value: 'Layout Hotkey'
data: '3'
type: REG_DWORD
- !registryValue:
path: 'HKCU\Keyboard Layout\Toggle'
value: 'Language Hotkey'
data: '3'
type: REG_DWORD
- !registryValue:
path: 'HKCU\Keyboard Layout\Toggle'
value: 'Hotkey'
data: '3'
type: REG_DWORD

This file was deleted.

0 comments on commit ffab734

Please sign in to comment.