forked from Revolutionary-Games/Thrive
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Bump Newtonsoft.Json from 13.0.1 to 13.0.3 #11
Open
dependabot
wants to merge
4,192
commits into
master
Choose a base branch
from
dependabot/nuget/Newtonsoft.Json-13.0.3
base: master
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.
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
Currently translated at 50.0% (320 of 640 strings) Co-authored-by: Span Staans <spaansstan@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/nl/ Translation: Thrive/Thrive Game
Currently translated at 50.0% (320 of 640 strings) Co-authored-by: Joah van der Maaden <voorjoah@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/nl/ Translation: Thrive/Thrive Game
Currently translated at 51.0% (327 of 640 strings) Co-authored-by: Span Staans <spaansstan@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/nl/ Translation: Thrive/Thrive Game
Currently translated at 51.0% (327 of 640 strings) Co-authored-by: tommy koning <tommykoning@live.nl> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/nl/ Translation: Thrive/Thrive Game
Currently translated at 94.8% (607 of 640 strings) Co-authored-by: Nozt <alib.athq@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/id/ Translation: Thrive/Thrive Game
Currently translated at 100.0% (640 of 640 strings) Co-authored-by: Davi Augusto Pinto Araújo <davi.augusto.araujo@hotmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/pt_BR/ Translation: Thrive/Thrive Game
Currently translated at 56.0% (359 of 640 strings) Co-authored-by: Span Staans <spaansstan@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/nl/ Translation: Thrive/Thrive Game
Currently translated at 56.0% (359 of 640 strings) Co-authored-by: Joah van der Maaden <voorjoah@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/nl/ Translation: Thrive/Thrive Game
Currently translated at 6.8% (44 of 640 strings) Co-authored-by: Ivan Kurta <ivkurta1@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/uk/ Translation: Thrive/Thrive Game
* first pass of fixing issue Revolutionary-Games#2065 * Added pop-up warning for save directory not existing * Add popup warning for saves directory pt 2 * minor edits to conform with coding style guidelines and consistency * changed error check to enum and ran update_localization for submission * removed braces on single-line 'if's as per style guide suggestion * made changes requested in Revolutionary-Games#2580
Currently translated at 99.8% (639 of 640 strings) Translation: Thrive/Thrive Game Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/tr/
Currently translated at 100.0% (640 of 640 strings) Translation: Thrive/Thrive Game Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/zh_Hans/
# Conflicts: # locale/bg.po # locale/de.po # locale/es.po # locale/fr.po # locale/he.po # locale/id.po # locale/it.po # locale/nl.po # locale/pt_BR.po # locale/tr.po # locale/zh_CN.po
* added core.safecrlf config to diff call * reset localization to master
* Feature is working * Organelle popup menu handling * Fixed visibility bug * Moved some code * Added moving * More specific input names * All functionality finished * Clarified names and summaries * Style change * Minor optimization * Updated localiations * Added english localization * Initial test * Sort of working * Feature works * Separated methods * Style change * Fixed a typo * Updated translations from master * Replaced translation files with master * Ran script and added translations
Currently translated at 100.0% (643 of 643 strings) Translated using Weblate (Bulgarian) Currently translated at 100.0% (643 of 643 strings) Co-authored-by: Georgi Georgiev (Жоро) <g.georgiev.shumen@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/bg/ Translation: Thrive/Thrive Game
Currently translated at 100.0% (643 of 643 strings) Co-authored-by: fgdfgfthgr-fox <fgdfgfthgr@126.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/zh_Hans/ Translation: Thrive/Thrive Game
Currently translated at 100.0% (643 of 643 strings) Co-authored-by: doomlightning <tamirt500@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/he/ Translation: Thrive/Thrive Game
Currently translated at 62.0% (399 of 643 strings) Co-authored-by: Liam Hallberg <tairuu00@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/sv/ Translation: Thrive/Thrive Game
Currently translated at 100.0% (643 of 643 strings) Co-authored-by: Simone Nobili <simonenobili@yandex.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/it/ Translation: Thrive/Thrive Game
Currently translated at 100.0% (643 of 643 strings) Co-authored-by: Jan <jan_fue@icloud.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/de/ Translation: Thrive/Thrive Game
…ation-bot/weblate-thrive-thrive-game * Translated using Weblate (Bulgarian) Currently translated at 100.0% (643 of 643 strings) Translated using Weblate (Bulgarian) Currently translated at 100.0% (643 of 643 strings) Co-authored-by: Georgi Georgiev (Жоро) <g.georgiev.shumen@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/bg/ Translation: Thrive/Thrive Game * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (643 of 643 strings) Co-authored-by: fgdfgfthgr-fox <fgdfgfthgr@126.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/zh_Hans/ Translation: Thrive/Thrive Game * Translated using Weblate (Hebrew) Currently translated at 100.0% (643 of 643 strings) Co-authored-by: doomlightning <tamirt500@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/he/ Translation: Thrive/Thrive Game * Translated using Weblate (Swedish) Currently translated at 62.0% (399 of 643 strings) Co-authored-by: Liam Hallberg <tairuu00@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/sv/ Translation: Thrive/Thrive Game Co-authored-by: Georgi Georgiev (Жоро) <g.georgiev.shumen@gmail.com> Co-authored-by: fgdfgfthgr-fox <fgdfgfthgr@126.com> Co-authored-by: doomlightning <tamirt500@gmail.com> Co-authored-by: Liam Hallberg <tairuu00@gmail.com>
* added scavanging niche * fleshed out chunk food source * removed print * removed atp reference * update to account for other factors * halfed energy from floating chunks * removed unneeded directives * Update Thrive.csproj * changed file name * put simulation back again * add base size attribute * linter appeasement * linter appeasement * linter appeasement * linter appeasement * renamed variable * reduced use of BaseHexSize calculation * converted reused calculations to var * removed var declaration to after early return
…ry-Games#2588) * updated mutation algorithm to prevent duplicating nuclei * work with lists not enumerations * linter appeasement * linter appeasement * removed useless conversion
* This is a change that Godot has wanted for a while I think we should include this now * Added a comment on BaseHexSize how it is related to the Microbe.EngulfSize
* Fixed rubocop old setting name, fixed the folder detector and moved to it to a new file * Started working on a credits from wiki retrieve script * Made a script to generate the credits for the game * Ignore the scripts folder when packaging the game * As of now up to date credits file * Basic test of up scrolling credits text * Added loading of the game credits * Added comment in the created credits json about it being autogenerated * Current developer credits scroll now works * Change to a string builder, fixed offsets for dynamic items when resizing * Added different fonts for the dynamically generated credits headings * Finished the credits showing * Fix release making for the renamed assets file * Renamed the variable used to determine if a file is old
* encapulated music functionality * added extinction track * play extinction on death * linter appeasement * Update src/microbe_stage/MicrobeStage.cs * removed whitespace
Bumps [SharpZipLib](https://github.com/icsharpcode/SharpZipLib) from 1.3.2 to 1.3.3. - [Release notes](https://github.com/icsharpcode/SharpZipLib/releases) - [Changelog](https://github.com/icsharpcode/SharpZipLib/blob/master/docs/Changes.txt) - [Commits](icsharpcode/SharpZipLib@v1.3.2...v1.3.3) --- updated-dependencies: - dependency-name: SharpZipLib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ry-Games#2602) * Fixed binding agent being able to be placed on prokaryote * Reworded comment * Added `an` Co-authored-by: Maxonovien <maxime.caute@free.fr> Co-authored-by: Maxonovien <maxime.caute@free.fr>
…2553) * Updated colony founding microbe colony status to prevent bug * Used OnColonyMember added instead * Created static colony creation method * Changed access of method * fixed style * Added JsonConstructor to JsonColony * changed method to static * styling * Changed serializer to allow private constructors * Styling * Added null check * Added null check * Ignore non JsonConstructor attributed constructors * Moved nullity check * reverted nullity check * removed outdated comment * Documented static method * Fixed typo in comment * Update comment * added Instance flag to construcotr search * Update src/microbe_stage/MicrobeColony.cs
Currently translated at 97.2% (745 of 766 strings) Translation: Thrive/Thrive Game Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/pt_BR/
Currently translated at 81.8% (627 of 766 strings) Translation: Thrive/Thrive Game Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/pt_PT/
…ation-bot/weblate-thrive-thrive-game Translations update from Weblate
* Add fading between list tracks in jukebox * renamed Fade with Crossfade * changed variable names, added TODO
* nerf photosynthesis by 25% * further nerf * further nerf
* created the hex grid within the shader * updated shader for GLES2 * updated to full floats * further improved the algorithm * added heavily inspired by Andrew Hung's tutorial * added https for link to be recognized. * fixed offset and black edges
* Refactored Thrive version reader to a separate file * Trying to add script for downloading godot steam templates * Disable the GodotSteam download as it doesn't include mono support * Add note about checking GodotSteam compatibility * Improve windows ruby setup instructions * Fix StyleCop version upgrade from missing other directory build props * Change the stylecop version in main csproj to be consistent * Added basic general code side for Steam integration * Added specifically enableable Steam build helpers and client code * Moved SteamHandler.cs PauseMode set to _Ready * Added the new fullscreen state to the print for the key that changes it * Added label showing current steam user name if loaded also made the steam error translatable * Added special steam build mode and export presets for it * Change paths for steam export on Windows * Implemented some more Steam callbacks, game now quits when requested from Steam * Moved the logged in steam user label to be underneath the main menus * Added a warning note message to make_release script when making Steam release * Fixed licenses display option not working in Steam version * Fixed the credits for the Steam version * Added "crossfade" to dictionary * Update make_release.rb * Update src/general/MainMenu.tscn * Update src/steam/SteamClient.cs * Changed ConnectSignals to use generics to show that the interface is required * Update src/steam/ISteamClient.cs * Change the steam license readme wording
Currently translated at 100.0% (768 of 768 strings) Translated using Weblate (English) Currently translated at 100.0% (766 of 766 strings) Co-authored-by: Georgi Georgiev (RacerBG) <g.georgiev.shumen@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/bg/ Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/en/ Translation: Thrive/Thrive Game
Currently translated at 99.6% (763 of 766 strings) Translated using Weblate (Portuguese (Portugal)) Currently translated at 99.6% (763 of 766 strings) Co-authored-by: TomDev03 <tomascsilvapro@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/pt_PT/ Translation: Thrive/Thrive Game
Currently translated at 99.6% (763 of 766 strings) Translated using Weblate (Portuguese (Portugal)) Currently translated at 99.6% (763 of 766 strings) Co-authored-by: Dr. A. S <Dr.A.S.Tuga@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/pt_PT/ Translation: Thrive/Thrive Game
Currently translated at 99.6% (763 of 766 strings) Co-authored-by: TomDev03 <tomascsilvapro@gmail.com> Translate-URL: https://translate.revolutionarygamesstudio.com/projects/thrive/thrive-game/pt_PT/ Translation: Thrive/Thrive Game
…ation-bot/weblate-thrive-thrive-game Translations update from Weblate
* Various balance tweaks * Additional tweaks
…mes#2758) * Assortment of tweaks, polishes and fixes to the gui. - Darken the autoevo results panel and added fades at the top and bottom to spice up the look as done in the gui mockup. - Decreased the x axis ticks of the patch details graphs to lessen crowding in tight spaces. - Made markers in graphs also be highlighted when hovering over the lines. - Changed default font size in thrive_theme.tres to 18. The previous size just looks oddly too big or it's probably just the new jura font version. - Changed the font size in some buttons in the microbe editor. - Moved cell editor's left panel down a bit to match with the vertical height of other panels in the other tabs. - Fixed MP bar shown as empty the first time switching to the cell editor tab. - Changed how the organelle tooltips are positioned. They are now appears at the bottom right edge of the part selection controls instead of following the mouse position. This makes the tooltips more steadier and I honestly think this feels much better. - The species name textbox now flash if the player attempts to enter invalid name. - Removed pressed animation of the graph dataset button. * Added method summary * Removed one unused local variable * Revert default font size change * Adjusted fonts * Clarified some docs
…nary-Games#2781) * Update CustomConfirmationDialog's strings on locale change * Call base method * Fixed custom dialog's WindowTitle not reacting to language change
* Various balance tweaks * Additional tweaks * Final changes for balance pass
…es#2791) * Loading screen thrive logo spinner jitters * Loading screen thrive logo spinner jitters
… tweaked the volume of a few sounds (Revolutionary-Games#2788)
* Turn licenses display into popup dialog * Removed extra blank line * Fixed localization * Fixed typo on resource path * Set licenses popup size to fullscreen * Fixed fuzzy translation * Changed back licenses view to be its own submenu Also fixed returning from licenses view brings back to the main menu instead of the extras menu.
…lutionary-Games#2756) * Calculate different RenderPriorities for the HexPositions. * updated render priority calculation * added helper function to get scene material * PR code cleanups * return null if no scene loaded * changed string to NodePath * made positive modulo more readable
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.3. - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases) - [Commits](JamesNK/Newtonsoft.Json@13.0.1...13.0.3) --- updated-dependencies: - dependency-name: Newtonsoft.Json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Dependabot tried to add
|
The following labels could not be found: |
I-Have-No-Idea-What-IAmDoing
force-pushed
the
master
branch
from
August 10, 2023 23:17
68775a5
to
04e41bf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 Newtonsoft.Json from 13.0.1 to 13.0.3.
Release notes
Sourced from Newtonsoft.Json's releases.
Commits
0a2e291
Remove prerelease for 13.0.34949c66
Update to 13.0.3-beta15702581
Fix: Null String being reported as String rather than JTokenType.Null (#2796)c908de3
Fix not returning negative double from box cache (#2777)2afdccd
Fix parsed decimal losing trailing zeroes (#2769)4fba53a
Remove prerelease for 13.0.2b15df4b
Add missing headers789bfd3
Update to 13.0.2-beta3b13717a
Add JsonCloneSettings to disable copy annotations (#2757)d0a328e
Fix MaxDepth not being used with ISerializable deserialization (#2736)Dependabot 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)