forked from tgstation/TerraGov-Marine-Corps
-
Notifications
You must be signed in to change notification settings - Fork 15
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
Chore(deps): Bump pillow from 9.0.1 to 9.3.0 in /tools/mapmerge2 #161
Open
dependabot
wants to merge
111
commits into
master220
Choose a base branch
from
dependabot/pip/tools/mapmerge2/pillow-9.3.0
base: master220
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Chore(deps): Bump pillow from 9.0.1 to 9.3.0 in /tools/mapmerge2 #161
dependabot
wants to merge
111
commits into
master220
from
dependabot/pip/tools/mapmerge2/pillow-9.3.0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dependabot
bot
added
dependencies
Pull requests that update a dependency file
python
Pull requests that update Python code
labels
Nov 22, 2022
* Tweak: Radio with russian keys - Радиоканалы человеков работают с русскими клавишами - Удалил обработку ненужную обработку голоса хайвмайнда. Так как в say уже разобрали на префикс и ключ - Русская раскладка для /datum/saymode/ (хайвмайнд, киборги). Проки и листы не генерировались на стадии PreInit, потому заменил на обычную инициализацию после загрузки мапы. * Tweak: Language with russian keyboard - Удалил uppertext у функции Vallat'а (прости, Vallat), чтобы использовать в своем коде - Если получил русскую букву, то перевести её на английский аналог и найти language * Fix: Removed useless GlobalLists and defines Осенило, что можно обойти без дефайнов и лишних списков * fix: requested by Vallat
* fix: Translated menu and lore * Перевел главное меню. Чтобы текст влез уменьшил текст в skin.dmf * Переведен лор в главном меню * fix: Review by BotPurple Поправлен перевод лора
Переведены и дополнены сообщения, которые выкрикивают командиры в чат
* Fix: Correct aura messages and turn on custom OOC color * Update config.txt Co-authored-by: Aziz Chynaliev <[email protected]>
Add new shipmap
Fixing bugs
* Feat: separate reject_bad_name option for cyrillic * Fix checks
* Refactor: change ban table format * Remove commas before statement * Bantype fix and ignore appearance bans * Fix string concat * Null checks * Change the way of checking for permabans
add: RO got Overwatch console add: Cargo got 2 supply vendors (Armor and clothing) add: SO got 2 additional Crew monitoring consoles add: Some areas got holopad fix: Replaced erroneous admin walls on deck 2
* ability icon * plant code * plant code update * range buff * cost fix * please just end the pain * revert * update code to new standard * timer deletion flag Co-authored-by: Jordan <Alexansans.mail.ru>
This reverts commit 709e4db.
Синты снова могут носить флэк джекет с модулями, ура.
Не смотря на то, что реверт сделан, флек джекет до сих пор не принимает модули. Значит просто добавим в код флек джекету модули, взятые с ксеноаутена.
Co-authored-by: Jordan <Alexansans.mail.ru>
(and also fix fix_me walls)
* fix * polishes many spears Co-authored-by: Jordan <Alexansans.mail.ru>
… when destroyed V2 (#152) Co-authored-by: Jordan <Alexansans.mail.ru>
* test * The floor is basalt * Sensor Capture * Weeeeeeeeeeed * CANDIGTUNNELAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * More Tunnels And Weeds * You have surv, I have LOOT * oops * Fix on fix
* Добавление беретов и трубок * Доработка спрайта * Доработка спрайтов 2 * Переформатировал пару файлов для во избежание будущих конфликтов Добавил игрушечную свинью Перенес все свои добавления в файл RU_items.dm * Фикс брони которую сломал Джоржан * Переспрайт револьверной винтовки и её патронов автором
Dependabot couldn't find the original pull request head commit, 1457067.
dependabot
bot
force-pushed
the
dependabot/pip/tools/mapmerge2/pillow-9.3.0
branch
from
December 2, 2022 18:15
1457067
to
ca22ba7
Compare
Bizzonium
force-pushed
the
master220
branch
2 times, most recently
from
December 23, 2022 08:39
eb4c929
to
53b7c67
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
dependencies
Pull requests that update a dependency file
Merge Conflict
This doesn't seem right
python
Pull requests that update Python code
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps pillow from 9.0.1 to 9.3.0.
Release notes
Sourced from pillow's releases.
... (truncated)
Changelog
Sourced from pillow's changelog.
... (truncated)
Commits
d594f4c
Update CHANGES.rst [ci skip]909dc64
9.3.0 version bump1a51ce7
Merge pull request #6699 from hugovk/security-libtiff_buffer2444cdd
Merge pull request #6700 from hugovk/security-samples_per_pixel-sec744f455
Added release notes0846bfa
Add to release notes799a6a0
Fix linting00b25fd
Hide UserWarning in logs05b175e
Tighter test case13f2c5a
Prevent DOS with large SAMPLESPERPIXEL in Tiff IFDDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)@dependabot use these labels
will set the current labels as the default for future PRs for this repo and language@dependabot use these reviewers
will set the current reviewers as the default for future PRs for this repo and language@dependabot use these assignees
will set the current assignees as the default for future PRs for this repo and language@dependabot use this milestone
will set the current milestone as the default for future PRs for this repo and languageYou can disable automated security fix PRs for this repo from the Security Alerts page.