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

uh oh something broke #10

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1b170f1
Warn if setting charges when they shouldn't
RenechCDDA Apr 1, 2024
0e8509f
butchery refuse does not try to spawn as charges
RenechCDDA Apr 1, 2024
5782745
Check if itype can have charges
RenechCDDA Apr 1, 2024
2fcfdc4
Fix charge spawning in tests
RenechCDDA Apr 2, 2024
01d6b77
remove obsoleted supressors
GuardianDll Apr 2, 2024
7e9bf13
Make the power
Standing-Storm Apr 5, 2024
952e26a
Routine i18n updates on 06 April 2024
kevingranade Apr 6, 2024
0837c81
Remove old savegame compatibility code
anothersimulacrum Apr 6, 2024
6e9f56a
Merge pull request #72859 from CleverRaven/i18n
Maleclypse Apr 6, 2024
28aa11c
Merge pull request #72856 from Standing-Storm/noisemaker
Maleclypse Apr 6, 2024
40c3bb5
Handle proficiency XP requirements changing
anothersimulacrum Apr 6, 2024
5c4c164
By default, EOCs train proficiencies normally
anothersimulacrum Apr 6, 2024
80b4ba0
Fix missing translation in NPC trade denial reason
BrettDong Apr 6, 2024
7fece1f
Merge pull request #72791 from GuardianDll/no_supressors
Maleclypse Apr 6, 2024
29f4429
Merge branch 'master' into catch_bad_charges
RenechCDDA Apr 6, 2024
812a5e3
More idiomatic true/false EOC argument
andrei8l Apr 6, 2024
84dae0b
Merge pull request #72780 from RenechCDDA/catch_bad_charges
akrieger Apr 7, 2024
73f46a9
Merge pull request #72863 from BrettDong/translate-npc-trade-denial-r…
Maleclypse Apr 7, 2024
e923e5f
Merge pull request #72861 from anothersimulacrum/proficiencies-fixes
Maleclypse Apr 7, 2024
9fc88ad
[MoM] Remove extended channeling recipe after learning, add Thought-F…
Standing-Storm Apr 7, 2024
3df7601
Untest tests
Venera3 Apr 7, 2024
fc83fae
Update mutations.json
Venera3 Apr 7, 2024
70ef397
Merge pull request #72879 from Venera3/mutation_consistency_check
Maleclypse Apr 7, 2024
ef0aebc
[MoM] Feral telekinetics can't throw you with telekinesis if you have…
Standing-Storm Apr 7, 2024
076bf6d
add enchantment that modifies your dodge chance (#72855)
GuardianDll Apr 7, 2024
ab7c937
ACTUALLY fix negative rest
RenechCDDA Apr 7, 2024
a36706c
comprehensive deprecation warning updates
casswedson Apr 7, 2024
a186121
Merge pull request #72893 from casswedson/bump-all-i-can
akrieger Apr 8, 2024
f557194
Merge pull request #72892 from RenechCDDA/fix_negative_rest_V2
Maleclypse Apr 8, 2024
ea8f34c
[MoM] Oubliette works on NPCs now (#72876)
Standing-Storm Apr 8, 2024
28db304
Merge pull request #72862 from anothersimulacrum/EOC-proficiency
Maleclypse Apr 8, 2024
0095b30
[MoM] Utilise test_eoc functionality to reduce duplicate conditions (…
Standing-Storm Apr 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/CBA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
ClangBuildAnalyzer --stop . buildAnalysis
- name: Analyze
run: ClangBuildAnalyzer --analyze buildAnalysis
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
with:
name: ClangBuildAnalyzer-traces
path: "**/obj/*.json"
2 changes: 1 addition & 1 deletion .github/workflows/astyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
cancel_others: 'true'
paths: '[".github/workflows/astyle.yml", "Makefile", ".astylerc", "**.cpp", "**.h", "**.c"]'
- run: echo ${{ github.event.number }} > pull_request_id
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
with:
name: pull_request_id
path: pull_request_id
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-branch-name.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: github.head_ref == 'master' && github.repository == 'CleverRaven/Cataclysm-DDA'
steps:
- name: Post warning
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
run: bash ./build-scripts/requirements.sh
- name: determine changed files
if: ${{ github.event_name == 'pull_request' }}
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
script: |
var fs = require('fs');
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/comment-commands.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4

- name: Set-up Comvent
uses: rytswd/comvent@v0.5.2
uses: rytswd/comvent@main
id: comvent
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
uses: actions/checkout@v4

- name: Set-up Comvent
uses: rytswd/comvent@v0.5.2
uses: rytswd/comvent@main
id: comvent
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detect-translation-file-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Detect translation file changes"
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format_emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: ls -a

- name: Upload zipped html as artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: formatter
path: formatter.html
Expand All @@ -40,7 +40,7 @@ jobs:
with:
ref: gh-pages

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v3.1.4
with:
name: formatter

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
cancel_others: 'true'
paths: '["**.json", ".github/workflows/json.yml"]'
- run: echo ${{ github.event.number }} > pull_request_id
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
with:
name: pull_request_id
path: pull_request_id
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -333,18 +333,18 @@ jobs:
echo ${{ github.event.number }} > pull_request_id
echo "false" > ${{ env.ARCHIVE_SUCCESS }}
if: ${{ env.ARCHIVE_SUCCESS && failure() }}
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
if: ${{ always() && env.ARCHIVE_SUCCESS }}
with:
name: pull_request_id
path: pull_request_id
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
if: ${{ always() && env.ARCHIVE_SUCCESS }}
with:
name: ${{ env.ARCHIVE_SUCCESS }}
path: ${{ env.ARCHIVE_SUCCESS }}
- name: upload artifacts if failed
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
if: failure()
with:
name: cata_test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/msvc-full-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
make

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.3.1
uses: microsoft/setup-msbuild@v2

- name: Use GNU tar to enable zstd for actions/cache
run: |
Expand All @@ -91,7 +91,7 @@ jobs:
vcpkg integrate install --vcpkg-root '${{ runner.workspace }}\b\vcpkg'

- name: Download ccache
uses: robinraju/release-downloader@v1.4
uses: robinraju/release-downloader@v1.9
with:
repository: 'ccache/ccache'
tag: 'v4.6.1'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/post-spell-check-result.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
github.event.workflow_run.conclusion == 'success' }}
steps:
- name: Download pr id artifact
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3.1.4
with:
workflow: ${{ github.event.workflow_run.name }}
run_id: ${{ github.event.workflow_run.id }}
name: pull_request_id
- name: Download spell check retcode artifact
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3.1.4
with:
workflow: ${{ github.event.workflow_run.name }}
run_id: ${{ github.event.workflow_run.id }}
Expand All @@ -32,14 +32,14 @@ jobs:
run: echo "spell-check-retcode=$( cat spell_check_retcode )" >> $GITHUB_OUTPUT
- name: Download spell check output artifact
if: steps.set-spell-check-retcode.outputs.spell-check-retcode >= 1
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3.1.4
with:
workflow: ${{ github.event.workflow_run.name }}
run_id: ${{ github.event.workflow_run.id }}
name: spell_check_output
- name: 'Comment on PR'
if: steps.set-spell-check-retcode.outputs.spell-check-retcode >= 1
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: |
curl -sL https://github.com/transifex/cli/releases/download/v1.6.4/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx
- name: "Delete existing i18n branch"
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
github-token: ${{ secrets.TX_PR_CREATOR }}
script: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
uses: lukka/get-cmake@latest
- name: Install dependencies (windows msvc) (1/4)
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1.3.1
uses: microsoft/setup-msbuild@v2
- name: Install dependencies (windows msvc) (2/4)
if: runner.os == 'Windows'
uses: lukka/run-vcpkg@v11
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
(cd build && zip ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }} *)
- name: Login to GitHub Container Registry
if: matrix.artifact == 'windows-objectcreator-x64' || matrix.artifact == 'linux-objectcreator-x64'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down Expand Up @@ -357,7 +357,7 @@ jobs:
mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
- name: Set up JDK 8 (android)
if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fi
- name: Download success artifact from basic build
if: ${{ github.event.workflow_run.name == 'General build matrix' }}
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3.1.4
with:
workflow: ${{ github.event.workflow_run.name }}
run_id: ${{ github.event.workflow_run.id }}
Expand All @@ -33,7 +33,7 @@ jobs:
id: set-basic-build-success
run: echo "basic-build-success=$( cat basic-build )" >> $GITHUB_OUTPUT
- name: Download pr id artifact
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3.1.4
with:
workflow: ${{ github.event.workflow_run.name }}
run_id: ${{ github.event.workflow_run.id }}
Expand All @@ -43,7 +43,7 @@ jobs:
run: echo "pr-id=$( cat pull_request_id )" >> $GITHUB_OUTPUT
- name: set-label
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.conclusion != 'skipped' || steps.set-basic-build-success.outputs.basic-build-success == 'true' }}
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
script: |
if ('${{ steps.set-pr-id.outputs.pr-id }}'.trim().length == 0) {
Expand All @@ -58,7 +58,7 @@ jobs:
}
- name: remove-label
if: ${{ github.event.workflow_run.conclusion == 'failure' && steps.set-basic-build-success.outputs.basic-build-success != 'true' }}
uses: actions/github-script@v6.3.3
uses: actions/github-script@v7
with:
script: |
if ('${{ steps.set-pr-id.outputs.pr-id }}'.trim().length == 0) {
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/text-changes-analyzer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ jobs:
wc -c spell_check_output | grep -o '[0-9]*' > spell_check_retcode
echo "length=$(cat spell_check_retcode)" >> $GITHUB_OUTPUT
- run: echo ${{ github.event.number }} > pull_request_id
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
with:
name: pull_request_id
path: pull_request_id
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
with:
name: spell_check_retcode
path: spell_check_retcode
- uses: actions/upload-artifact@v3.1.2
- uses: actions/upload-artifact@v4
if: steps.get_length.outputs.length >= 1
with:
name: spell_check_output
Expand Down
40 changes: 20 additions & 20 deletions data/credits/it_IT.credits
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@
<color_yellow>KorGgenT</color>- Rasoio professionale per yak.

<color_white>Un ringraziamento speciale a:</color>
<color_yellow>un altro simulacro</color>- Per essere intervenuto e aver svolto il duro lavoro.
<color_yellow>Pantaloni bombastici</color>- Per aver arricchito il sistema di armatura e averci fatto sudare.
<color_yellow>Fris0uman</color>- Per far funzionare i nostri frigoriferi.
<color_yellow>John-Candlebury</color>- Per Hub01 e tutte le bellissime mappe.
<color_yellow>comunque</color>- Per mappe parametriche e posizioni mutabili.
<color_yellow>BrettDong</color> - For translations and analyzing weird bugs.
<color_yellow>wapcaplet</color>- Per tutto ciò che riguarda la barra laterale.
<color_yellow>ZhilkinSerg</color>- Per unire tutte le cose.
<color_yellow>Rivetto-lo-Zombie</color>- Per aver mantenuto il record di una fusione al giorno.
<color_yellow>Notte-Pryanik</color>- Per innumerevoli correzioni di bug e miglioramenti.
<color_yellow>Qrox</color>- Per aver migliorato ulteriormente l'infrastruttura dell'interfaccia utente.
<color_yellow>Ramza13</color>- Per trasformare JSON in un linguaggio completo.
<color_yellow>anothersimulacrum</color> - Per tutto il lavoro svolto.
<color_yellow>BombasticSlacks</color> - Per aver rifinito il sistema di armatura e per averci introdotto alla sudorazione.
<color_yellow>Fris0uman</color>- Per aver fatto funzionare i frigoriferi.
<color_yellow>John-Candlebury</color>- Per l'Hub01 e tutte le bellissime mappe.
<color_yellow>jbytheway</color> - Per la generazione parametrica delle mappe e posizioni variabili.
<color_yellow>BrettDong</color> - Per le traduzioni e l'analisi di bug strani.
<color_yellow>wapcaplet</color>- Per tutto ciò che riguarda la sidebar.
<color_yellow>ZhilkinSerg</color>- Per tutti i merge effettuati.
<color_yellow>Rivet-the-Zombie</color> - Per aver mantenuto il record di un merge al giorno.
<color_yellow>Night-Pryanik</color>- Per innumerevoli correzioni di bug e miglioramenti.
<color_yellow>Qrox</color>- Per aver migliorato ulteriormente la UI.
<color_yellow>Ramza13</color>- Per aver trasformato JSON in un linguaggio turing-completo.
<color_yellow>Drew4484</color>- Per tutto l'acciaio.
<color_yellow>LyleSY</color>- Per ancora più dinosauri.
<color_yellow>irwiss</color>,<color_yellow>Maleclisse</color>,<color_yellow>Venera3</color>,<color_yellow>Mylie Daniels</color>,<color_yellow>andrei8l</color>,<color_yellow>mqrause</color>, E<color_yellow>Eltank</color>.
<color_yellow>LyleSY</color>- Per tutti i dinosauri.
<color_yellow>irwiss</color>, <color_yellow>Maleclypse</color>, <color_yellow>Venera3</color>, <color_yellow>MylieDaniels</color>, <color_yellow>andrei8l</color>, <color_yellow>mqrause</color>, and <color_yellow>Eltank</color>.

<color_white>Ringraziamenti speciali in ambito artistico:</color>
<color_yellow>Fris0uman</color>,<color_yellow>Golfavel</color>,<color_yellow>vetall812</color>,<color_yellow>Dandy-ragazzo</color>, e molti altri.
<color_yellow>Fris0uman</color>, <color_yellow>Golfavel</color>, <color_yellow>vetall812</color>, <color_yellow>Dandy-boy</color>, and many more.

<color_white>Per una lista completa dei contributori si prega di vedere:</color>
<color_cyan>https://github.com/CleverRaven/Cataclysm-DDA/contributors</color>
Expand All @@ -36,14 +36,14 @@

******************************************************************************

<color_white>Principali sviluppatori (<color_cyan>0.F</color>):</color>
<color_white>Sviluppatori Principali (<color_cyan>0.F</color>):</color>
<color_yellow>mlangsdorf</color> - Veicoli, barche, accampamenti e guide sul modding.
<color_yellow>I-am-Erk</color> - L'eredità di Ultica vivrà per sempre.
<color_yellow>KorGgenT</color> - Non so dove mettere le mie assi di legno.

<color_white>Ringraziamenti speciali a (<color_cyan>0.F</color>):</color>
<color_yellow>Aivean</color> - Per la performance straordinaria.
<color_yellow>un altro simulacro</color>- Per avermi stancato.
<color_yellow>anothersimulacrum</color> - Per avermi stancato.
<color_yellow>comunque</color>- Per avermi fatto realizzare cose.
<color_yellow>BrettDong</color> - Per il progetto di traduzione e altro.
<color_yellow>Qrox</color> - Per aver trovato e mostrato i messaggi d'errore.
Expand All @@ -60,10 +60,10 @@

******************************************************************************

<color_white>Principali sviluppatori (<color_cyan>0.E</color>):</color>
<color_white>Sviluppatori Principali (<color_cyan>0.E</color>):</color>
<color_yellow>mlangsdorf</color> - Veicoli, barche, accampamenti e guide sul modding.
<color_yellow>Io sono Erk</color>- Ultica, dialoghi, NPC e disordine nelle cucine.
<color_yellow>KorGgenT</color>- Magicismo e mal di pancia.
<color_yellow>I-am-Erk</color> - Ultica, dialoghi, NPC e il disordine nelle cucine.
<color_yellow>KorGgenT</color>- Magiclysm e mal di pancia.

<color_white>Ringraziamenti speciali a (<color_cyan>0.E</color>):</color>
<color_yellow>Narcotraffico</color>- Per la manutenzione del bot di creazione automatico Jenkins.
Expand Down
2 changes: 0 additions & 2 deletions data/json/items/gunmod/barrel.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"riv_suppressor",
"shot_suppressor",
"suppressor",
"mp5sd_suppressor",
Expand Down
6 changes: 0 additions & 6 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"shot_suppressor",
"suppressor",
"suppressor_compact",
Expand Down Expand Up @@ -391,7 +390,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"shot_suppressor",
"suppressor",
"suppressor_compact",
Expand Down Expand Up @@ -451,7 +449,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"shot_suppressor",
"suppressor",
"suppressor_compact",
Expand Down Expand Up @@ -1681,7 +1678,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"shot_suppressor",
"suppressor",
"suppressor_compact",
Expand Down Expand Up @@ -3113,7 +3109,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"shot_suppressor",
"suppressor",
"suppressor_compact",
Expand Down Expand Up @@ -3163,7 +3158,6 @@
"blacklist_mod": [
"crafted_suppressor",
"filter_suppressor",
"bottle_suppressor",
"shot_suppressor",
"suppressor",
"suppressor_compact",
Expand Down
Loading