1.12.2 2.0 #9

Open

ToastGun wants to merge 99 commits from 1.12.2-2.0 into master

pull from: 1.12.2-2.0

merge into: ThreeTAG-Legacy:master

ThreeTAG-Legacy:master

ThreeTAG-Legacy:1.12.2-Lite

ThreeTAG-Legacy:1.12

ThreeTAG-Legacy:1.11.2

ThreeTAG-Legacy:1.10.2

ThreeTAG-Legacy:1.8.9

Conversation 32 Commits 99 Files changed 1121 +16763 -17948

ToastGun commented 2020-08-14 15:20:35 +00:00 (Migrated from gitlab.com)

Copy link

No description provided.

ToastGun commented 2020-08-14 15:33:23 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 67d46671 - Update src/main/resources/assets/speedsterheroes/suitsets/cw_savitar.json,...

Compare with previous version

added 1 commit <ul><li>67d46671 - Update src/main/resources/assets/speedsterheroes/suitsets/cw_savitar.json,...</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=106466691&start_sha=97009cce16d745779c82c51568e42bff213c1cca)

ToastGun commented 2020-08-15 16:30:15 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• e3033ece - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json

Compare with previous version

added 1 commit <ul><li>e3033ece - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=106550796&start_sha=67d466710cb32916855ef91461f6008cc5692c02)

ToastGun commented 2020-08-15 17:38:10 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• ef04bbd9 - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json

Compare with previous version

added 1 commit <ul><li>ef04bbd9 - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=106554088&start_sha=e3033ece29e63ecf450e38c751c3484c26f90385)

ToastGun commented 2020-08-15 20:38:57 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 12bbc491 - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json,...

Compare with previous version

added 1 commit <ul><li>12bbc491 - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json,...</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=106558791&start_sha=ef04bbd9cb4a6cd6d4d855866899b3f452578853)

ToastGun commented 2020-08-18 20:01:05 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 59b58b01 - Update src/main/resources/assets/speedsterheroes/textures/models/armor/cw_black_flash/helmet.png

Compare with previous version

added 1 commit <ul><li>59b58b01 - Update src/main/resources/assets/speedsterheroes/textures/models/armor/cw_black_flash/helmet.png</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=107090977&start_sha=12bbc491f6f6de70dc895475c6765593fa466d6d)

ToastGun commented 2020-10-09 20:27:48 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 02e46d88 - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json

Compare with previous version

added 1 commit <ul><li>02e46d88 - Update src/main/resources/assets/speedsterheroes/superpowers/speedforce.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=117322542&start_sha=59b58b01ad02a928004272af67eb4fc04a56e397)

ToastGun commented 2021-01-19 09:01:44 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• d5273f42 - Update src/main/resources/assets/speedsterheroes/suitsets/cw_flash.json

Compare with previous version

added 1 commit <ul><li>d5273f42 - Update src/main/resources/assets/speedsterheroes/suitsets/cw_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=136930903&start_sha=02e46d883da99697a7e0786349bc63416d75f36f)

ToastGun commented 2021-09-15 19:03:50 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 0a2fee0d - Update comic_flash.json

Compare with previous version

added 1 commit <ul><li>0a2fee0d - Update comic_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246059154&start_sha=d5273f423740663c79d0a5acf4f0797e5e8719d6)

ToastGun commented 2021-09-15 19:04:14 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 7724371c - Update comic_godspeed.json

Compare with previous version

added 1 commit <ul><li>7724371c - Update comic_godspeed.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246059324&start_sha=0a2fee0d3b7dfb0dbd60d041033133402e4292fb)

ToastGun commented 2021-09-15 19:04:39 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• c67b07ef - Update comic_jesse_quick.json

Compare with previous version

added 1 commit <ul><li>c67b07ef - Update comic_jesse_quick.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246059534&start_sha=7724371cff5a17babfe11f1588096e420fc1fe53)

ToastGun commented 2021-09-15 19:05:00 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 376b9700 - Update comic_new52_flash.json

Compare with previous version

added 1 commit <ul><li>376b9700 - Update comic_new52_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246059686&start_sha=c67b07efe8dc396de3c2062bdb29c8d038809bf6)

ToastGun commented 2021-09-15 19:05:15 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• a260306e - Update comic_professor_zoom.json

Compare with previous version

added 1 commit <ul><li>a260306e - Update comic_professor_zoom.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246059803&start_sha=376b9700ef54595650a1a15e7390ece7aa2fcfcd)

ToastGun commented 2021-09-15 19:05:46 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 1ea7ceae - Update comic_rebirth_wally_west.json

Compare with previous version

added 1 commit <ul><li>1ea7ceae - Update comic_rebirth_wally_west.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060034&start_sha=a260306eda3b1f3bc63e551411e2f03439ed5e7c)

ToastGun commented 2021-09-15 19:06:05 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• e26f10db - Update comic_reverse_flash.json

Compare with previous version

added 1 commit <ul><li>e26f10db - Update comic_reverse_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060154&start_sha=1ea7ceaeb6f45ef624f240a353bf4f5a2179b487)

ToastGun commented 2021-09-15 19:06:24 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• e6054782 - Update comic_speed.json

Compare with previous version

added 1 commit <ul><li>e6054782 - Update comic_speed.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060310&start_sha=e26f10dba759536cdc492a72661bf8dde5c0c689)

ToastGun commented 2021-09-15 19:06:50 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• f6010a34 - Update comic_wally_west_flash.json

Compare with previous version

added 1 commit <ul><li>f6010a34 - Update comic_wally_west_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060461&start_sha=e60547820ad2d268bc1a68160bb958fed6edcef8)

ToastGun commented 2021-09-15 19:07:11 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 22b48131 - Update comic_wally_west_kid_flash.json

Compare with previous version

added 1 commit <ul><li>22b48131 - Update comic_wally_west_kid_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060586&start_sha=f6010a345afcdcb2a952848cfc4ee67d8aa2092c)

ToastGun commented 2021-09-15 19:07:29 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 0fc20045 - Update cw_accelerated_man.json

Compare with previous version

added 1 commit <ul><li>0fc20045 - Update cw_accelerated_man.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060704&start_sha=22b48131bf16f9e86c3f54e4d648ea4f48909c59)

ToastGun commented 2021-09-15 19:07:48 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• b00a5511 - Update cw_black_flash.json

Compare with previous version

added 1 commit <ul><li>b00a5511 - Update cw_black_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246060862&start_sha=0fc200458e69eff37a2897edcc71168472e1b5ec)

ToastGun commented 2021-09-15 19:08:08 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 22069632 - Update cw_flash.json

Compare with previous version

added 1 commit <ul><li>22069632 - Update cw_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061022&start_sha=b00a5511026a17192e57807879e0e37284674637)

ToastGun commented 2021-09-15 19:08:26 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 6faec98c - Update cw_flash_season_1.json

Compare with previous version

added 1 commit <ul><li>6faec98c - Update cw_flash_season_1.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061160&start_sha=22069632c06917309c5fa99fd98bf60deb781623)

ToastGun commented 2021-09-15 19:08:57 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 5eab83d9 - Update cw_jay_garrick.json

Compare with previous version

added 1 commit <ul><li>5eab83d9 - Update cw_jay_garrick.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061407&start_sha=6faec98ca020ae70b90679a88488199ed73356be)

ToastGun commented 2021-09-15 19:09:12 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 261983b1 - Update cw_jay_garrick2.json

Compare with previous version

added 1 commit <ul><li>261983b1 - Update cw_jay_garrick2.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061510&start_sha=5eab83d9c13fcb0936ed535a2b1b380f74a7c602)

ToastGun commented 2021-09-15 19:09:34 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 8e823f23 - Update cw_jesse_quick.json

Compare with previous version

added 1 commit <ul><li>8e823f23 - Update cw_jesse_quick.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061696&start_sha=261983b11f3c58b73b8975045487156419532ed7)

ToastGun commented 2021-09-15 19:09:53 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 9972360d - Update cw_kid_flash.json

Compare with previous version

added 1 commit <ul><li>9972360d - Update cw_kid_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061831&start_sha=8e823f237d3ef72b653633fdb69dc50fa191b43e)

ToastGun commented 2021-09-15 19:10:15 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 0cdc14a6 - Update cw_reverse_flash.json

Compare with previous version

added 1 commit <ul><li>0cdc14a6 - Update cw_reverse_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246061974&start_sha=9972360d3080bdf1cacecdedb0c4201f80c02176)

ToastGun commented 2021-09-15 19:10:34 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 8eb1ec40 - Update cw_savitar.json

Compare with previous version

added 1 commit <ul><li>8eb1ec40 - Update cw_savitar.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246062114&start_sha=0cdc14a6c42fecea508d4fac66fbd219d0a375b6)

ToastGun commented 2021-09-15 19:10:53 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• decb89ab - Update cw_the_rival.json

Compare with previous version

added 1 commit <ul><li>decb89ab - Update cw_the_rival.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246062263&start_sha=8eb1ec40c00df9de637ac5cda4c487fa416cc4ea)

ToastGun commented 2021-09-15 19:11:18 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 00b7ee0c - Update cw_trajectory.json

Compare with previous version

added 1 commit <ul><li>00b7ee0c - Update cw_trajectory.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246062435&start_sha=decb89ab86ddaa1a013a5e8d936f2ac9a39c4b7c)

ToastGun commented 2021-09-15 19:11:32 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 51e691dd - Update cw_zoom.json

Compare with previous version

added 1 commit <ul><li>51e691dd - Update cw_zoom.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246062544&start_sha=00b7ee0cc8729b79dbb2c660e417e3744fabb45e)

ToastGun commented 2021-09-15 19:11:46 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 8b2b947a - Update dceu_flash.json

Compare with previous version

added 1 commit <ul><li>8b2b947a - Update dceu_flash.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246062622&start_sha=51e691dd619e7bf8cf1cc2d97d16052ae99931e3)

ToastGun commented 2021-09-15 19:12:02 +00:00 (Migrated from gitlab.com)

Copy link

added 1 commit

• 648debe9 - Update flay.json

Compare with previous version

added 1 commit <ul><li>648debe9 - Update flay.json</li></ul> [Compare with previous version](/threetag/legacy/SpeedsterHeroes/-/merge_requests/6/diffs?diff_id=246062724&start_sha=8b2b947a08e9cf831d5d13fb641b31c9925917b3)

This pull request is broken due to missing fork information.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 1.12.2-2.0:1.12.2-2.0

git switch 1.12.2-2.0

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff 1.12.2-2.0

git switch 1.12.2-2.0

git rebase master

git switch master

git merge --ff-only 1.12.2-2.0

git switch 1.12.2-2.0

git rebase master

git switch master

git merge --no-ff 1.12.2-2.0

git switch master

git merge --squash 1.12.2-2.0

git switch master

git merge --ff-only 1.12.2-2.0

git switch master

git merge 1.12.2-2.0

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

ThreeTAG-Legacy/SpeedsterHeroes!9

No description provided.