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

MCprep RC Scripts to Dev #588

Merged
merged 18 commits into from
Jun 17, 2024
Merged

MCprep RC Scripts to Dev #588

merged 18 commits into from
Jun 17, 2024

Commits on Sep 10, 2023

  1. Added files related to creating release candidates

    This commit adds the necesary files to create an MCprep release
    candidate:
    - download_resources.sh: automatically downloads and moves assets
      from the latest stable release of MCprep
    - rc-bl_info.patch: patches bl_info for release candidates
    StandingPadAnimations committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    b690f93 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a389739 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'dev' into mcprep-rc

    Weekly merge of dev for MCprep 3.5 RC-3
    StandingPadAnimations committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    e156592 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f7b632e View commit details
    Browse the repository at this point in the history
  5. Added patch to remove RC ignore filter in updater

    While production builds should ignore Release Candidates, release
    candidates shouldn't as release candidate updates can introduce
    important fixes.
    StandingPadAnimations committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    e88f205 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Moved patch to correct location

    This should be under the patches folder
    StandingPadAnimations committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    3578810 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Configuration menu
    Copy the full SHA
    7627727 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. Merge branch 'dev' into mcprep-rc

    Weekly updating of the mcprep-rc branch
    StandingPadAnimations committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    93e9a50 View commit details
    Browse the repository at this point in the history
  2. Added patch to change tracker ID for RCs

    This patch changes the ID for MCprep RCs so that we don't confuse them
    in the tracker.
    StandingPadAnimations committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    7b87949 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Removed rc-filter-remove patch

    This patch was used once and will now be removed on the basis that it
    would cause more issues then it solves.
    StandingPadAnimations committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    a2a9d1d View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2024

  1. MCprep 3.6 RC-1 (#566)

    * Update Asset-Submission.yaml to add asset-submission (#449)
    
    Moving forward, using this label to apply to asset submissions to make it easier to identify, and to potentially identify community members to review.
    
    * Change bpy build yaml config
    
    * Migrating more critical tests ahead of release.
    
    This includes QA checking scripts, which have already uncovered one
    issue with one of the updated rigs.
    
    * Migrated tests deleted from prior commit.
    
    * Removed last bv28 calls and no longer necessary qa test limit
    
    * Fixed geo node effect spawning for blender 4.0+ and migrated tests.
    
    * Resolved most lint errors in the mcmodel file.
    
    * Removed already irrelevant old unit tests.
    
    * Updated mapping data
    
    * Enable unittest -t flag to match entire test classes or files.
    
    * Fix running util_test class on its own.
    
    * Fix bug where the "discover" unittest function would delete data json.
    
    This was a weird one. Essentially, running the unittests would always
    result in the `mcprep_data_update.json` file being renamed to
    `mcprep_data.json` (and since that file isn't tracked in git, would look
    like the file was deleted wrt to local changes). This was happening, out
    of all things, due to this line in the unittest runner:
    
    unittest.TestLoader().discover(MODULE_DIR, "*_test.py")
    
    This is because the discover command clearly has to attempt loading of
    the modules it's scanning over, and at some point we import the env
    module and thus the __init__ code on module load would trigger,
    resulting in the file rename. By moving the rename into the register
    function, we ensure it only happens in the context of an addon, which
    is all we really need for it.
    
    * Migrated all remaining tests, with all tests passing.
    
    Unfortunately, we do still have the issue that the test runner renames
    the mcprep_data_update.json file, and modifies checked-in mtl files,
    but we can address this in the future.
    
    * Removed the old test script and shell files.
    
    The new test runner in python is straight forward enough to use that I
    feel there is no longer a need for any system-specific shell files.
    
    * Upversion MCprep to v3.5
    
    * Ensure exit code of test runner is non-zero if any failure
    
    * Create the initial release-drafting shell script
    
    * Incrementing version for dev branch
    
    * Added disclaimer in README
    
    * Adopting py 3.7+ syntax and removing most lint warnings and errors
    
    Some can't be avoided, such as those around bpy property definitions.
    
    * Proactively identify bad analytics ID and replace with new one
    
    Addresses an issue introduced in MCprep v3.5.0
    
    * Raise more specific error with runtime error wrapper in background.
    
    * Establish baseline tracker.py unittest
    
    * Ensure bad parent id is overwritten by good local id + exhaustive tests
    
    * Renaming SKIP_IDS to be INVALID_IDS.
    
    * Updated BlenderChanges.md for Blender 4.0
    
    * fix overlay geometry
    
    * Updated for safer and more common bash script styling
    
    * Add comment, slight face offset for overlay geometry
    
    * Offset the overlay texture only
    
    * Update load material function to support principled BSDF v2 in blender 4.0
    
    * Add bpy-build to gitignore
    
    * Revert "Add bpy-build to gitignore"
    
    This reverts commit 03ac1d2.
    
    * Revert "Change bpy build yaml config"
    
    This reverts commit 8f2f793.
    
    * Reducing overlay offset and merge by distance margin
    
    * Upversion for next release
    
    * Improved releaser script
    
    Ran into a couple issues during the last release
    
    * Upversion post 3.5.1 release
    
    * Ensure tracker files never remain after tests or during prod builds (#506)
    
    Two levels of trying to make sure we never ship with tracker code again.
    Also removed now-redundant test for checking if tracker id present in git dir
    
    * Marked optimizer as deprecated
    
    * Added note on deprecation in optimize_scene.py
    
    * Remove deprecated conf.py references
    
    This commit removes the deprecated conf.py references that were meant to
    be removed in MCprep 3.5.1, but weren't due to Blender 4.0's release
    
    * Removed make_annotations and renamed compat funcs
    
    * Fixed "Find Missing" due to animated image location and added test. (#520)
    
    This operator was already high in terms of test coverage, but the one
    branch not covered (and, the todo listed) was for animated textures. of
    course, that was what went wrong. Now it tests this branch too.
    
    * Fix direct socket name reference error in optimizer. (#519)
    
    * Prevent collection-effect obj particle src from being cleaned up. (#518)
    
    Before this change, if a collection effect included a particle system
    where the source of the particles was an object (as opposed to an entire
    collection), then on save and reload of that file, the particle object
    would have been cleaned up, as it was not linked to the scene and for
    some reason, since forever, blender does not count usage of an object
    as a particle emitter as an object use reference when it comes to its
    own internal cleanup.
    
    Works now, tested by saving and reloading a file after spawning in a
    version of the firework tutorial where I didn't use a collection as the
    firework source.
    
    * Made notice regarding owning a legal copy of Minecraft more visible (#522)
    
    More explicit notice about having valid MC license
    
    ---------
    
    Co-authored-by: TheDuckCow & StandingPad Animations
    
    * Change Skin Swap's behavior for more nuanced swapping (#498)
    
    * Changed behavior of skin swap to be more nuanced
    
    Skin swap originally would change all image textures on all materials of
    the selected object, regardless of whether the user wanted to or not.
    This is not ideal for rigs that need multiple seperate textures.
    
    To expand the use case of skin swap, skin swap will now use a more
    nuanced method of swapping skins based on node name, which is an already
    established precedent from the MCprep Cycles Optimizer
    
    * Fixed detection of node name in set_cycles_texture
    
    * Fixed error with node name checks
    
    * Changed name check to ignore duplicates
    
    * Rename and set swap_all_imgs default for texture changing function
    
    Adding positional args to fix ordered references and set, while making
    custom nuanced swapping still possible.
    
    ---------
    
    Co-authored-by: Patrick W. Crawford <[email protected]>
    
    * Upversion for MCprep v3.5.2
    
    * Update Bug-Report.yml (#525)
    
    * Updated mcprep_data json mapping for latest MC 1.20.4
    
    * Readme updates for new settings and deprecation note
    
    * Updating grass canonical mapping and improved desaturation debug prints
    
    With this, we now have correct prep material saturation again for this
    grass object, and all tests passing again.
    
    * Added clarification to README
    
    * Fixed incorrect keyword argument
    
    * Added swap texture pack test
    
    * Upversion and disable porcelain check
    
    * Updated test run script and refreshed data file for MC 1.20.5
    
    * chore: Merging Milestone 3.6.0 to Dev
    
    * Upgrade to BpyBuild 0.3.0
    
    * Updated reference command in CONTRIBUTING.md
    
    * Added action-scripts folder with BpyBuild actions
    
    This is so we can better organize our scripts
    
    * Added Ignore Filters action as default
    
    This was something that would have been useful in #505, and now we have
    it :D
    
    * Updated ignore_filters.py to print deleted files
    
    This is a small change that'll make it easier to understand what's going
    on at runtime with regards to the ignore filter
    
    * Updated build command in run_tests.py
    
    * Added print statement to dev.py
    
    * Updated bpy-build.yaml
    
    * Added .blend filter for dev builds
    
    * Switched to BpyBuild ignore filters
    
    * Revert "Switched to BpyBuild ignore filters"
    
    This reverts commit 7469142.
    
    * Updated config option in BpyBuild
    
    * Added warning to ignore_filters.py
    
    * Added error object for better user experience
    
    * Switched to BaseException for MCprepError
    
    * Removed redundant variable
    
    * Refactored colorspace setup to be more flexible
    
    In the past, we'd set this to a hard coded value. However, that proved
    to be annoying to users using non-standard OCIO configs like ACES or
    early versions of AgX. MCprep already fixes MTL files for ACES
    compatibility, so we're expanding this to prep materials.
    
    In `mcprep_data.json`, there will now be a section called
    "non_color_options", which is a list of different options for Non-Color
    Data/Generic Data. If a user is using a non-standard setup, they can
    simply add the correct option in the JSON file and prep materials will
    function properly.
    
    The matching goes in order from first to last, and MCprep will use the
    first value matched at runtime.
    
    * First commit for i18n
    
    * Added .venv to gitignore
    
    * Fixed missing ) and added additional string
    
    * Moved import statement for inspect
    
    * Reduced nesting in function
    
    * refactor(comment): Refactored comment in util.py
    
    * Added some metadata to English PO file
    
    * build(config): Removed ignore filter
    
    * Update .gitignore
    
    Co-authored-by: Patrick W. Crawford <[email protected]>
    
    * chore: removed MCprep_resources from gitignore
    
    * feat: Added zn_CN to Languages
    
    * refactor(language): moved en to en_US
    
    * feat: make MCprep follow the user's Blender locale
    
    * refactor(languages): moved to zn_HANS
    
    * fix: made translations change on the fly
    
    * fix: Added fallback for non-existent translations
    
    * fix: Fixed fallback
    
    * Added some details to MCprep POT
    
    * docs: Added documentation on translating MCprep
    
    * docs(i18n): Removed redundant line
    
    * Updated POT file
    
    * chore(i18n): Added new strings to zn_HANS
    
    * Recompiled zh_HANS
    
    * fix(annotations): Added missing annotation to _
    
    * docs(i18n): Added developer documentation
    
    * Added polib to dependencies
    
    * build: Added dictionary generator for i18n
    
    This allows us to use bpy.app.translations without requiring translators
    to have Python experience. While Blender allegedly has this ability, I
    haven't been able to find it, so as far as I'm aware, it doesn't exist.
    
    * Added use of bpy.app.translations
    
    * fix(i18n): Fixed detection of translations.py
    
    * Added autobuilding of MO files to default action
    
    * docs(i18n): Updated i18n docs for maintainers
    
    * build(i18n): Added comments to mo compile script
    
    * docs(i18n): Added BpyBuild to i18n docs
    
    * chore(git): Added MO files to .gitignore
    
    * refactor(removal): Remove MCprep optimizer
    
    The MCprep optimizer was deprecated in the MCprep 3.5 series, and slated
    for removal in MCprep 3.6. This is due to the following reasons:
    - Outdated design (made prior to Blender 3.0 when Cycles X was still in
      development, and has yet to adapt to modern Cycles)
    - Extreme bugs that are hard to fix, such as 80+ light bounces
    - Unnecessary as there's no special optimizations for Minecraft scenes,
      and on the contrary may actually be a bad thing as it uses settings
      like clamping indirect with horrible options
    
    * Added polib directly in the source tree
    
    * build: Added separate translate action
    
    * build: added if-name-main to all actions
    
    * docs(i18n): Updated developer docs
    
    * Readded flake8 to requirements.txt
    
    * docs(i18n): Removed negative tone from docs
    
    * Revert "Added polib directly in the source tree"
    
    This reverts commit 8288d5d.
    
    * Updated POT file
    
    * Updated contributing guide readme
    
    * docs: Updated BlenderChanges.md
    
    * build: Add script to generate POT file + Migration to BpyBuild 0.4 (#548)
    
    * build: Add script to generate POT file
    
    * build: Moved build_pot to a separate action
    
    * Fixed metadata and line reference generation
    
    * Updated POT file
    
    * build: Future proofed script for BpyBuild actions
    
    * Revert "build: Future proofed script for BpyBuild actions"
    
    This reverts commit 2d1533a.
    
    * deps: Updated BpyBuild to 0.4
    
    * build: Updated build_pot to use pre_build
    
    * i18n: Updated POT file
    
    * build: Moved build-pot to translate action
    
    * build: Fixed error causing wrong POT comments
    
    * Added translate to release script
    
    * Further update the release script to track changes and safer ver check
    
    * build: Add metadata to POT file, added 4.1 and 4.2
    
    ---------
    
    Co-authored-by: Patrick W. Crawford <[email protected]>
    
    ---------
    
    Co-authored-by: Patrick W. Crawford <[email protected]>
    
    ---------
    
    Co-authored-by: Patrick W. Crawford <[email protected]>
    Co-authored-by: Cathal Feeney <[email protected]>
    Co-authored-by: [email protected] <[email protected]>
    Co-authored-by: Trung Phạm <[email protected]>
    Co-authored-by: Patrick W. Crawford <[email protected]>
    6 people authored Apr 28, 2024
    Configuration menu
    Copy the full SHA
    1f22236 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. rc-files: Update Version Patch

    Signed-off-by: Mahid Sheikh <[email protected]>
    StandingPadAnimations committed May 17, 2024
    Configuration menu
    Copy the full SHA
    a60b8bc View commit details
    Browse the repository at this point in the history
  2. rc-files: Fix bug with bl_idname in tracker patch

    Signed-off-by: Mahid Sheikh <[email protected]>
    StandingPadAnimations committed May 17, 2024
    Configuration menu
    Copy the full SHA
    54f4219 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge branch 'dev' into mcprep-rc

    Signed-off-by: Mahid Sheikh <[email protected]>
    StandingPadAnimations committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    27676ae View commit details
    Browse the repository at this point in the history
  2. rc-files: Update resources link

    Signed-off-by: Mahid Sheikh <[email protected]>
    StandingPadAnimations committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    d9302bf View commit details
    Browse the repository at this point in the history
  3. rc-files: Updated bl_info patch to 3.6 RC-2

    Signed-off-by: Mahid Sheikh <[email protected]>
    StandingPadAnimations committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ec42e9c View commit details
    Browse the repository at this point in the history
  4. docs: Add info on applying patches

    Signed-off-by: Mahid Sheikh <[email protected]>
    StandingPadAnimations committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    9106447 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ea2a26d View commit details
    Browse the repository at this point in the history