Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
dreamwhite committed Dec 16, 2024
2 parents 7d0de8d + 7763dea commit 0a3e39a
Show file tree
Hide file tree
Showing 67 changed files with 709 additions and 93 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update_oc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
run: "rm -rf oc"

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ github.token }}
commit-message: Updated OpenCore binaries
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
Project Changelog
==============
#### [1.0.2](https://github.com/dreamwhite/dell-inspiron-5370-hackintosh/releases/tag/1.0.2)
Sorry for the delay again but university is my main goal at the moment :)
- Binaries update
- [OpenCore 1.0.2](https://github.com/acidanthera/OpenCorePkg/releases/tag/1.0.2)
- [AppleALC 1.9.2](https://github.com/acidanthera/AppleALC/releases/1.9.2)
- [VoodooI2C 2.9.1](https://github.com/VoodooI2C/VoodooI2C/releases/tag/v2.9.1)

#### [0.9.8](https://github.com/dreamwhite/dell-inspiron-5370-hackintosh/releases/tag/0.9.8)
Sorry for the delay but had some stuff to sort out in this period
- Binaries update
- [OpenCore 0.9.5](https://github.com/acidanthera/OpenCorePkg/releases/tag/0.9.8)
- [AppleALC 1.8.6](https://github.com/acidanthera/AppleALC/releases/1.8.7)
- [OpenCore 0.9.8](https://github.com/acidanthera/OpenCorePkg/releases/tag/0.9.8)
- [AppleALC 1.8.7](https://github.com/acidanthera/AppleALC/releases/1.8.7)
- Added `FirmwareSettingsEntry.efi`

#### [0.9.5](https://github.com/dreamwhite/dell-inspiron-5370-hackintosh/releases/tag/0.9.5)
Expand Down
Binary file modified EFI/BOOT/BOOTx64.efi
Binary file not shown.
Binary file modified EFI/OC/Drivers/FirmwareSettingsEntry.efi
Binary file not shown.
Binary file modified EFI/OC/Drivers/OpenCanopy.efi
Binary file not shown.
Binary file modified EFI/OC/Drivers/OpenRuntime.efi
Binary file not shown.
Binary file modified EFI/OC/Drivers/ResetNvramEntry.efi
Binary file not shown.
Loading

0 comments on commit 0a3e39a

Please sign in to comment.