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.

Sign up for GitHub

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

Jump to bottom

Merge Frozen into master #355

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Merge Frozen into master #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2372e0
Merge pull request #354 from pyanodon/master
kingarthur91 Feb 14, 2024
81ddc2e
fixed issue with 2.1.21
kingarthur91 Feb 14, 2024
a16c494
version and changelog
kingarthur91 Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 2.1.22
Date: 2024-2-14
Changes:
- Uh, we had a slight weapons malfunction, but uh... everything's perfectly all right now. We're fine. We're all fine here now, thank you.
---------------------------------------------------------------------------------------------------
Version: 2.1.21
Date: 2024-2-14
Changes:
Expand Down
2 changes: 1 addition & 1 deletion data.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ end

-- ))

require('prototypes/achievements')
--require('prototypes/achievements')
require('prototypes/logo')
require('prototypes/menu-simulations')

Expand Down
2 changes: 1 addition & 1 deletion info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pycoalprocessing",
"version": "2.1.21",
"version": "2.1.22",
"factorio_version": "1.1",
"title": "Pyanodons Coal Processing",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",
Expand Down
Loading