forked from ClanGenOfficial/clangen
-
Notifications
You must be signed in to change notification settings - Fork 58
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
Small fixing yet again #231
Merged
Merged
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
Honeycase
commented
Sep 29, 2024
- Realizing my mistakes
- Fixing reported bugs
I just gave it a random name but if anyone knows the actual name for the accessory between moreferns and bleeding hearts on the sheet, feel free to change this
acc_display has a typo! it says BLEEDINVINES |
(I do not trust myself with load_cat.py so if someone can put these changes I there ily) DAISY from flower_accessories is now DAISIES HEATHER from springwinter is now CALLUNA CLOVER from plant2_accessories is now SINGULARCLOVER RASPBERRY from fruit_accessories is now RASPBERRY2 MONARCH BUTTERFLY from deadInsect_accessories in now MONARCH
^ I don't know how to add these to load_cat but I think we should be okay? They shared names with other accessories so at least these will be its own thing now What was wrong with "LAVENDERTAILWRAP" and "YELLOWWISTERIA"? I tried putting them as tail accessories then realized those were its own pngs. whoops |
scoutpilled
added a commit
to scoutpilled/lifegenN
that referenced
this pull request
Oct 3, 2024
commit d19a345 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Wed Oct 2 17:45:17 2024 -0500 crash fix commit 5274dd4 Merge: 1b33465 fb7c9b4 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Tue Oct 1 21:19:41 2024 -0500 Merge pull request sedgestripe#231 from Honeycase/LifeGen-dev Small fixing yet again commit fb7c9b4 Merge: b406650 1b33465 Author: Honeycase <157860472+Honeycase@users.noreply.github.com> Date: Tue Oct 1 19:37:37 2024 -0500 Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev commit b406650 Author: Honeycase <terraaz13@gmail.com> Date: Tue Oct 1 10:35:14 2024 -0500 oops typo commit 2628a8f Author: Honeycase <terraaz13@gmail.com> Date: Tue Oct 1 10:33:26 2024 -0500 Changing accessory names (I do not trust myself with load_cat.py so if someone can put these changes I there ily) DAISY from flower_accessories is now DAISIES HEATHER from springwinter is now CALLUNA CLOVER from plant2_accessories is now SINGULARCLOVER RASPBERRY from fruit_accessories is now RASPBERRY2 MONARCH BUTTERFLY from deadInsect_accessories in now MONARCH commit 1b33465 Merge: 95c7d2d 171ade6 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Tue Oct 1 09:00:30 2024 -0500 Merge pull request sedgestripe#233 from jaysoleson/LifeGen-dev dev bugs commit 171ade6 Author: Jay <jayolesonbz@gmail.com> Date: Tue Oct 1 08:55:23 2024 -0500 fixes commit 95c7d2d Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Tue Oct 1 08:42:41 2024 -0500 crash fix commit 1343c18 Merge: d2cec23 4dda93e Author: Jay <jayolesonbz@gmail.com> Date: Mon Sep 30 19:30:40 2024 -0500 Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev commit d2cec23 Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 15:46:16 2024 -0500 shunned ceremony fix commit 61fa48a Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 15:23:56 2024 -0500 euuggh commit 4dda93e Merge: 654fc4e 429cd4f Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 29 14:00:28 2024 -0500 Merge pull request sedgestripe#232 from jaysoleson/LifeGen-dev more fixes commit 429cd4f Merge: c57b9a4 042eaba Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 13:57:27 2024 -0500 Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev commit c57b9a4 Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 13:57:20 2024 -0500 pronouning commit 042eaba Merge: 2277b6e 654fc4e Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 29 13:52:25 2024 -0500 Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev commit 2277b6e Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 13:51:52 2024 -0500 text fixes, all event filter fix commit 67ed44f Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 13:41:38 2024 -0500 minor dialogue fixes, talk category in meow bug addons commit 654fc4e Merge: 314459d 33381e5 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 29 13:34:04 2024 -0500 Merge pull request sedgestripe#230 from jaysoleson/LifeGen-dev Trait + Skills for Abbrev addons commit f957dcd Author: Honeycase <terraaz13@gmail.com> Date: Sun Sep 29 00:24:05 2024 -0500 added previously missing accessory I just gave it a random name but if anyone knows the actual name for the accessory between moreferns and bleeding hearts on the sheet, feel free to change this commit 33381e5 Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 29 00:12:28 2024 -0500 flirt accept tags commit 6b4d1e5 Merge: 3897469 3822115 Author: Jay <jayolesonbz@gmail.com> Date: Sat Sep 28 21:35:26 2024 -0500 Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev commit 3897469 Merge: dee5054 314459d Author: Jay <jayolesonbz@gmail.com> Date: Sat Sep 28 21:34:48 2024 -0500 Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev commit dee5054 Author: Jay <jayolesonbz@gmail.com> Date: Sat Sep 28 21:34:39 2024 -0500 faded cat fam tree fix commit 322813d Author: Jay <jayolesonbz@gmail.com> Date: Sat Sep 28 21:27:44 2024 -0500 somewhat bullshit crash fix commit 3822115 Merge: 1f21680 314459d Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Thu Sep 26 22:20:10 2024 -0500 Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev commit 1f21680 Author: Jay <jayolesonbz@gmail.com> Date: Thu Sep 26 20:57:43 2024 -0500 trait + skill addons commit fa9a265 Author: Honeycase <terraaz13@gmail.com> Date: Thu Sep 26 19:13:03 2024 -0500 Update newborn.json commit 7fd9bba Author: Honeycase <terraaz13@gmail.com> Date: Thu Sep 26 15:53:24 2024 -0500 I made an error commit 314459d Merge: 1ed6ec9 fdc4e17 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Thu Sep 26 13:14:13 2024 -0500 Merge pull request sedgestripe#229 from ReigningMonarch/LifeGen-dev BT + Patrol fixes commit 1ed6ec9 Merge: 3a53717 875e5f1 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Thu Sep 26 13:12:29 2024 -0500 Merge pull request sedgestripe#228 from Honeycase/Honey-sprite-mod some patrol cleanup commit 3a53717 Merge: 2a3c79d fe2cb19 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Thu Sep 26 13:12:19 2024 -0500 Merge pull request sedgestripe#227 from Honeycase/LifeGen-dev Minor fixes commit fdc4e17 Author: Reign <155932891+ReigningMonarch@users.noreply.github.com> Date: Thu Sep 26 13:52:20 2024 -0400 BT + Patrol fixes commit d6885c5 Author: Jay <jayolesonbz@gmail.com> Date: Thu Sep 26 12:46:39 2024 -0500 WAIT commit 005baa1 Author: Jay <jayolesonbz@gmail.com> Date: Thu Sep 26 12:43:41 2024 -0500 lifegen => pridegen commit 875e5f1 Author: Honeycase <terraaz13@gmail.com> Date: Thu Sep 26 11:56:05 2024 -0500 Update deputy.json commit e4bc605 Author: Honeycase <terraaz13@gmail.com> Date: Thu Sep 26 11:44:07 2024 -0500 some patrol cleanup commit fe2cb19 Merge: f2e6a7d 2a3c79d Author: Honeycase <157860472+Honeycase@users.noreply.github.com> Date: Wed Sep 25 16:33:04 2024 -0500 Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev commit f2e6a7d Author: Honeycase <terraaz13@gmail.com> Date: Tue Sep 24 20:49:26 2024 -0500 Update warrior.json commit 6c139b8 Author: Jay <jayolesonbz@gmail.com> Date: Tue Sep 24 11:56:58 2024 -0500 typo commit 2a3c79d Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Tue Sep 24 11:32:16 2024 -0500 crash fix commit ff36c45 Author: Honeycase <terraaz13@gmail.com> Date: Tue Sep 24 10:20:11 2024 -0500 Minor fixes commit 6cb2220 Merge: b992721 c69ca04 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Mon Sep 23 18:49:34 2024 -0500 Merge pull request sedgestripe#226 from jaysoleson/LifeGen-dev shunned ceremony fix attempt + dev bugs commit c69ca04 Merge: 43155d7 b992721 Author: Jay <jayolesonbz@gmail.com> Date: Mon Sep 23 17:58:02 2024 -0500 Merge branch 'LifeGen-dev' of https://github.com/jaysoleson/jay-dev into LifeGen-dev commit 43155d7 Author: Jay <jayolesonbz@gmail.com> Date: Mon Sep 23 17:57:54 2024 -0500 small fixes commit add421e Author: Jay <jayolesonbz@gmail.com> Date: Mon Sep 23 15:32:33 2024 -0500 dev bugs commit b992721 Merge: 35086f3 a046a06 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 22 20:02:55 2024 -0500 Merge pull request sedgestripe#225 from jaysoleson/LifeGen-dev more dev bugs commit a046a06 Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 22 19:40:07 2024 -0500 dev bugs commit 35086f3 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 22 12:41:39 2024 -0500 my dumb ass commit a213652 Merge: af1f02b 955516c Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 22 12:39:12 2024 -0500 Merge pull request sedgestripe#224 from jaysoleson/LifeGen-dev Dev bugs + moved filters commit 955516c Merge: d82e51e af1f02b Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 22 12:23:20 2024 -0500 Merge branch 'sedgestripe:LifeGen-dev' into LifeGen-dev commit d82e51e Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 22 12:21:44 2024 -0500 dev bugs commit af1f02b Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 22 10:43:34 2024 -0500 df mentor text fix commit 2841aa0 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Sun Sep 22 10:27:14 2024 -0500 crash fix commit 8a5f78d Merge: 98e8453 4c5e3d5 Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 22 10:06:15 2024 -0500 Merge branch 'LifeGen-dev' of https://github.com/sedgestripe/clangen into LifeGen-dev commit 98e8453 Author: Jay <jayolesonbz@gmail.com> Date: Thu Sep 19 17:49:31 2024 -0500 man commit 8ade4b8 Author: Jay <jayolesonbz@gmail.com> Date: Wed Sep 18 18:35:54 2024 -0500 abbrev fixes commit 4c5e3d5 Merge: b6572c8 a8bac78 Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Wed Sep 18 15:56:49 2024 -0500 Merge pull request sedgestripe#222 from jaysoleson/LifeGen-dev more buggies commit b6572c8 Merge: d350177 1a1620c Author: sedgestripe <110428732+sedgestripe@users.noreply.github.com> Date: Wed Sep 18 15:56:37 2024 -0500 Merge pull request sedgestripe#221 from sedgestripe/fix-lifegen-dev-builds ci: adjust checked paths to re-submit dev artifacts to the update API commit f0fac6c Author: Jay <jayolesonbz@gmail.com> Date: Wed Sep 18 15:43:33 2024 -0500 df mate moving on, moved event filters, patrol crash fix commit d350177 Merge: 8d40b52 add6809 Author: Jay <144476842+jaysoleson@users.noreply.github.com> Date: Wed Sep 18 08:28:50 2024 -0500 Merge pull request sedgestripe#223 from Honeycase/LifeGen-dev Fixed a few of my mistakes commit 6fae26b Author: Jay <jayolesonbz@gmail.com> Date: Tue Sep 17 13:58:35 2024 -0500 df mate moving on commit bbbdb52 Author: Jay <jayolesonbz@gmail.com> Date: Mon Sep 16 21:37:23 2024 -0500 some dialogue commit a8bac78 Author: Jay <jayolesonbz@gmail.com> Date: Mon Sep 16 12:21:50 2024 -0500 brruuuuh commit 516245c Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 15 21:04:14 2024 -0500 patrol leader fix commit a01bea2 Author: Jay <jayolesonbz@gmail.com> Date: Sun Sep 15 13:35:37 2024 -0500 multi season dialogue tags
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.