Skip to content

Commit

Permalink
This is v1.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Pyrdacor committed Jul 27, 2022
1 parent 1a7fe25 commit 003eda4
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<Authors>Robert Schneckenhaus</Authors>
<Description>OpenAL audio interface implementation for Ambermoon</Description>
<RepositoryUrl>https://github.com/Pyrdacor/Ambermoon.net</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.Common/Ambermoon.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<RepositoryType>Github</RepositoryType>
<Description>Library that contains basic stuff for other Ambermoon libraries.</Description>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<PackageProjectUrl>https://github.com/Pyrdacor/Ambermoon.net</PackageProjectUrl>
<PackageTags>Ambermoon</PackageTags>
<Configurations>Debug;Release;DebugAndroid</Configurations>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.Core/Ambermoon.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<LangVersion>8</LangVersion>
<RootNamespace>Ambermoon</RootNamespace>
<UserSecretsId>5ff861f6-0255-427a-978a-7a8030ee8731</UserSecretsId>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<Authors>Robert Schneckenhaus</Authors>
<PackageProjectUrl>https://github.com/Pyrdacor/Ambermoon.net</PackageProjectUrl>
<RepositoryUrl>https://github.com/Pyrdacor/Ambermoon.net</RepositoryUrl>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.Data.Common/Ambermoon.Data.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RepositoryType>Github</RepositoryType>
<PackageTags>Ambermoon Amiga</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<Configurations>Debug;Release;DebugAndroid</Configurations>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RepositoryType>Github</RepositoryType>
<PackageTags>Ambermoon</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<UserSecretsId>485e4790-32fd-45f1-b729-c5ca93ba0fad</UserSecretsId>
<Configurations>Debug;Release;DebugAndroid</Configurations>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RepositoryType>Github</RepositoryType>
<PackageTags>Ambermoon Legacy Amiga Game Data</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>Debug;Release;DebugAndroid</Configurations>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.Data.Pyrdacor/Ambermoon.Data.Pyrdacor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Configurations>Debug;Release;DebugAndroid</Configurations>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<Authors>Robert Schneckenhaus</Authors>
<Description>OpenGL render interface implementation for Ambermoon</Description>
<PackageProjectUrl>https://github.com/Pyrdacor/Ambermoon.net</PackageProjectUrl>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.net/Ambermoon.net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>Ambermoon</RootNamespace>
<RuntimeIdentifiers>win-x86;win-x64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
<Version>1.7.0</Version>
<Version>1.7.1</Version>
<Copyright>Copyright (C) 2020-2021 by Robert Schneckenhaus</Copyright>
<Company>Robert Schneckenhaus</Company>
<Authors>Robert Schneckenhaus</Authors>
Expand Down
2 changes: 1 addition & 1 deletion Ambermoon.net/Mac/Ambermoon.net.app/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleName</key>
<string>Ambermoon.net</string>
<key>CFBundleVersion</key>
<string>1.7.0</string>
<string>1.7.1</string>
<key>CFBundleIconFile</key>
<string>Ambermoon.icns</string>
<key>CFBundleIdentifier</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>10.7.0</Version>
<Version>10.7.1</Version>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion AmbermoonPatcher/AmbermoonPatcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishTrimmed>true</PublishTrimmed>
<Version>1.7.0</Version>
<Version>1.7.1</Version>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion Package/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


------------------------------------------------------------------
| Ambermoon rewrite by Pyrdacor - Version 1.7.0 - July 2022 |
| Ambermoon rewrite by Pyrdacor - Version 1.7.1 - July 2022 |
------------------------------------------------------------------


Expand Down
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ Ambermoon.net is a full C# rewrite of Ambermoon and will run at least on Windows

### Download

Version 1.6.10 is the most recent version from 21-06-2022. It also includes [Ambermoon Advanced](https://github.com/Pyrdacor/Ambermoon-Advanced).
Version 1.7.0 is the most recent version from 12-07-2022. It includes [original version 1.16](https://github.com/Pyrdacor/Ambermoon) and also [Ambermoon Advanced 0.01](https://github.com/Pyrdacor/Ambermoon-Advanced).

Version 1.6.8 and later should now also work on ARM Macs (M1, etc)!

You can also download the game on my website at www.pyrdacor.net!

Platform | Download 1.6.10
Platform | Download 1.7.0
--- | :-:
**Windows 64bit** | [Link](https://ambermoon-net.pyrdacor.net/download/1.6.10/Ambermoon.net-Windows.zip)
**Linux 64bit** | [Link](https://ambermoon-net.pyrdacor.net/download/1.6.10/Ambermoon.net-Linux.tar.gz)
Expand Down Expand Up @@ -44,6 +44,7 @@ A completely new game extension was also released called [Ambermoon Advanced](ht
- [German Manual / Handbuch Deutsch](https://ambermoon-net.pyrdacor.net/download/Ambermoon_Handbuch_Deutsch.pdf)
- [English Manual](https://ambermoon-net.pyrdacor.net/download/AmbermoonManualEnglish.pdf)
- [English Amiga Walkthrough](https://ambermoon-net.pyrdacor.net/download/Walkthrough.txt) by Michael Böhnisch (1999)
- [Tools](https://github.com/Pyrdacor/Ambermoon/blob/master/AmbermoonTools/README.md)

### Need help?

Expand Down Expand Up @@ -182,7 +183,7 @@ You can find the full changelog [here](changelog.md). You can also look at the [

## Special thanks

Special thanks to my top patreons:
Special thanks to my top patreons and github sponsors:
- [Other Retro Matt](https://twitter.com/GothmogPlays)
- Lorenz P.
- Stephan [Mankie](https://twitter.com/MankiesWorkshop)
Expand All @@ -196,6 +197,8 @@ Special thanks to my top patreons:
- soulsuckingjerk
- Mahen
- timbo t
- Robin Mattheussen (@romatthe)
- Teladi (@Levidega)

Special thanks to some special contributors and testers as well:
- kermitfrog
Expand All @@ -212,3 +215,5 @@ Special thanks to some special contributors and testers as well:
Checkout my already working 'SerfCity (Die Siedler) rewrite' at [freeserf.net](https://github.com/Pyrdacor/freeserf.net).

I also created another github project called [Ambermoon](https://github.com/Pyrdacor/Ambermoon) for providing resources and research the game data. Feel free to have a look or contribute.

And I work on a huge extension of Ambermoon called [Ambermoon Advanced](https://github.com/Pyrdacor/Ambermoon-Advanced).
4 changes: 2 additions & 2 deletions publish.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if ($isWindows) {
dotnet publish -c Release ./AmbermoonPatcher/AmbermoonPatcher.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r win-x64 --nologo --self-contained
dotnet publish -c Release ./Ambermoon.net/Ambermoon.net.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r win-x86 --no-restore --nologo --self-contained
dotnet publish -c Release ./Ambermoon.net/Ambermoon.net.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r win-x64 --no-restore --nologo --self-contained
Write-Host Pack standalone zips for Windows
Write-Host Pack zips for Windows
Start-Process -FilePath "./Ambermoon.ConcatFiles/bin/Any CPU/Release/net6.0/win-x64/publish/Ambermoon.ConcatFiles" -Wait -WorkingDirectory . -ArgumentList 'versions','"./versions.dat"','"./Ambermoon.net/bin/Any CPU/Release/net6.0/win-x64/publish/Ambermoon.net.exe"'
cmd /c copy "Ambermoon.net\bin\Any CPU\Release\net6.0\win-x64\publish\Ambermoon.net.exe" "Ambermoon.net\Ambermoon.net.exe"
7z a Ambermoon.net-Windows.zip "./Ambermoon.net/Ambermoon.net.exe" "./AmbermoonPatcher/bin/Any CPU/Release/net6.0/win-x64/publish/AmbermoonPatcher.exe" "./Ambermoon.net/x64/api-ms-win-core-winrt-l1-1-0.dll" "./Package/*" -mx9
Expand All @@ -27,7 +27,7 @@ if ($isWindows) {
7z a Ambermoon.net-Linux.tar.gz Ambermoon.net-Linux.tar -mx9
rm Ambermoon.net-Linux.tar
} else {
Write-Host Publish Mac executable
Write-Host Publish Mac executables
dotnet publish -c Release ./AmbermoonPatcher/AmbermoonPatcher.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r osx-x64 --nologo --self-contained
dotnet publish -c Release ./AmbermoonPatcher/AmbermoonPatcher.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r osx-arm64 --nologo --self-contained
dotnet publish -c Release ./Ambermoon.net/Ambermoon.net.csproj -p:PublishSingleFile=true -p:IncludeAllContentForSelfExtract=true -r osx-x64 --no-restore --self-contained
Expand Down
Binary file modified versions.dat
Binary file not shown.

0 comments on commit 003eda4

Please sign in to comment.