{"count":610,"next":"https://weblate.foundryvtt-hub.com/api/projects/automated-evocations-variant-fork/changes/?format=json&page=2","previous":null,"results":[{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/glossary/?format=json","translation":null,"user":null,"author":null,"timestamp":"2025-02-19T23:36:42.141924Z","action":47,"target":"","old":"","details":{"alert":"BrokenProjectURL"},"id":494187,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/494187/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2025-02-19T22:36:52.466749Z","action":47,"target":"","old":"","details":{"alert":"BrokenProjectURL"},"id":494182,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/494182/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-04-07T16:26:46.128192Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","status":"interactive rebase in progress; onto a15e7e1\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'a15e7e1'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .eslintrc\n\tnew file: .github/workflows/release.yml\n\tnew file: .prettierrc.js\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .editorconfig\n\tboth added: .eslintignore\n\tboth added: .github/ISSUE_TEMPLATE/bug_report.md\n\tboth added: .github/ISSUE_TEMPLATE/feature_request.md\n\tboth added: .github/ISSUE_TEMPLATE/styling.md\n\tboth added: .github/workflows/main.yml\n\tboth added: .gitignore\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/de.json\n\tboth added: src/languages/en.json\n\tboth added: src/languages/fr.json\n\tboth added: src/languages/ja.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/automatedEvocationsVariantModels.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/scripts/socket.js\n\tboth added: src/styles/comapnionmanager.css\n\tboth added: src/styles/spellconfig.css\n\n"},"id":454332,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/454332/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-04-07T16:26:44.223422Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":454331,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/454331/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-03-25T03:55:48.421607Z","action":47,"target":"","old":"","details":{"alert":"UnusedComponent"},"id":453215,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/453215/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-03-01T03:09:14.010214Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":443621,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443621/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-28T21:49:33.228135Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443504,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443504/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-28T20:07:37.179822Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":443499,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443499/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-28T20:06:33.972315Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443498,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443498/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-27T03:18:11.805172Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":443212,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443212/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-26T03:45:01.133990Z","action":47,"target":"","old":"","details":{"alert":"RepositoryOutdated"},"id":443193,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443193/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T22:15:29.124344Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443178,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443178/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T21:40:39.835490Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443177,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443177/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T21:12:25.364401Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":443172,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443172/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T21:10:46.484307Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443171,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443171/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T19:52:17.252155Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","status":"interactive rebase in progress; onto 0915a61\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '0915a61'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .eslintrc\n\tnew file: .github/workflows/release.yml\n\tnew file: .prettierrc.js\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .editorconfig\n\tboth added: .eslintignore\n\tboth added: .github/ISSUE_TEMPLATE/bug_report.md\n\tboth added: .github/ISSUE_TEMPLATE/feature_request.md\n\tboth added: .github/ISSUE_TEMPLATE/styling.md\n\tboth added: .github/workflows/main.yml\n\tboth added: .gitignore\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/de.json\n\tboth added: src/languages/en.json\n\tboth added: src/languages/fr.json\n\tboth added: src/languages/ja.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/automatedEvocationsVariantModels.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/scripts/socket.js\n\tboth added: src/styles/comapnionmanager.css\n\tboth added: src/styles/spellconfig.css\n\n"},"id":443158,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/443158/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T19:52:15.051128Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443157,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443157/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T18:17:13.078845Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","status":"interactive rebase in progress; onto 3e2fdab\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '3e2fdab'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .eslintrc\n\tnew file: .github/workflows/release.yml\n\tnew file: .prettierrc.js\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .editorconfig\n\tboth added: .eslintignore\n\tboth added: .github/ISSUE_TEMPLATE/bug_report.md\n\tboth added: .github/ISSUE_TEMPLATE/feature_request.md\n\tboth added: .github/ISSUE_TEMPLATE/styling.md\n\tboth added: .github/workflows/main.yml\n\tboth added: .gitignore\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/de.json\n\tboth added: src/languages/en.json\n\tboth added: src/languages/fr.json\n\tboth added: src/languages/ja.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/automatedEvocationsVariantModels.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/scripts/socket.js\n\tboth added: src/styles/comapnionmanager.css\n\tboth added: src/styles/spellconfig.css\n\n"},"id":443156,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/443156/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T18:15:57.419673Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443153,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443153/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T17:05:59.652187Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":443151,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443151/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T17:04:21.567521Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443150,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443150/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:55:04.803547Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/styling.md\nAuto-merging .github/ISSUE_TEMPLATE/styling.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/feature_request.md\nAuto-merging .github/ISSUE_TEMPLATE/feature_request.md\nCONFLICT (add/add): Merge conflict in .github/ISSUE_TEMPLATE/bug_report.md\nAuto-merging .github/ISSUE_TEMPLATE/bug_report.md\nCONFLICT (add/add): Merge conflict in .eslintignore\nAuto-merging .eslintignore\nCONFLICT (add/add): Merge conflict in .editorconfig\nAuto-merging .editorconfig\n (1)","status":"interactive rebase in progress; onto 31d4b8c\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '31d4b8c'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .eslintrc\n\tnew file: .github/workflows/release.yml\n\tnew file: .prettierrc.js\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .editorconfig\n\tboth added: .eslintignore\n\tboth added: .github/ISSUE_TEMPLATE/bug_report.md\n\tboth added: .github/ISSUE_TEMPLATE/feature_request.md\n\tboth added: .github/ISSUE_TEMPLATE/styling.md\n\tboth added: .github/workflows/main.yml\n\tboth added: .gitignore\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/de.json\n\tboth added: src/languages/en.json\n\tboth added: src/languages/fr.json\n\tboth added: src/languages/ja.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/automatedEvocationsVariantModels.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/scripts/socket.js\n\tboth added: src/styles/comapnionmanager.css\n\tboth added: src/styles/spellconfig.css\n\n"},"id":443149,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/443149/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:54:28.695795Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443148,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443148/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:53:14.760359Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)","status":"interactive rebase in progress; onto 89be6ce\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '89be6ce'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .eslintignore\n\tnew file: .eslintrc\n\tnew file: .github/workflows/release.yml\n\tnew file: .prettierrc.js\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .github/workflows/main.yml\n\tboth added: .gitignore\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/de.json\n\tboth added: src/languages/en.json\n\tboth added: src/languages/fr.json\n\tboth added: src/languages/ja.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/automatedEvocationsVariantModels.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/scripts/socket.js\n\tboth added: src/styles/comapnionmanager.css\n\tboth added: src/styles/spellconfig.css\n\n"},"id":443147,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/443147/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:53:09.166319Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/spellconfig.css\nAuto-merging src/styles/spellconfig.css\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/socket.js\nAuto-merging src/scripts/socket.js\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/automatedEvocationsVariantModels.js\nAuto-merging src/scripts/automatedEvocationsVariantModels.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/ja.json\nAuto-merging src/languages/ja.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in src/languages/en.json\nAuto-merging src/languages/en.json\nCONFLICT (add/add): Merge conflict in src/languages/de.json\nAuto-merging src/languages/de.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)","status":"interactive rebase in progress; onto 89be6ce\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '89be6ce'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .eslintignore\n\tnew file: .eslintrc\n\tnew file: .github/workflows/release.yml\n\tnew file: .prettierrc.js\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .github/workflows/main.yml\n\tboth added: .gitignore\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/de.json\n\tboth added: src/languages/en.json\n\tboth added: src/languages/fr.json\n\tboth added: src/languages/ja.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/automatedEvocationsVariantModels.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/scripts/socket.js\n\tboth added: src/styles/comapnionmanager.css\n\tboth added: src/styles/spellconfig.css\n\n"},"id":443146,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/443146/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:52:23.116414Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443145,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443145/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:52:05.238921Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443144,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443144/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:51:11.799281Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":443143,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/443143/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-25T16:49:59.747226Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":443142,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/443142/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-20T03:08:57.997931Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":442734,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/442734/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-16T03:08:18.461613Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":441700,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/441700/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-02-13T03:10:09.485020Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":441402,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/441402/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-01-31T03:10:30.905744Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":438941,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/438941/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-01-29T03:11:59.677904Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":438784,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/438784/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-01-24T03:10:06.099098Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":435665,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/435665/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2024-01-11T03:13:13.210273Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":415462,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/415462/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-12-26T03:10:47.247889Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":413670,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/413670/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-12-17T03:07:44.010672Z","action":47,"target":"","old":"","details":{"alert":"UpdateFailure"},"id":410056,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/410056/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-13T18:21:50.942163Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in gulpfile.js\nAuto-merging gulpfile.js\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .prettierrc.js\nAuto-merging .prettierrc.js\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in gulpfile.js\nAuto-merging gulpfile.js\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .prettierrc.js\nAuto-merging .prettierrc.js\n (1)","status":"interactive rebase in progress; onto 841adba\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '841adba'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .prettierrc.js\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: gulpfile.js\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/fr.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/styles/comapnionmanager.css\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":319166,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/319166/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-13T18:21:49.846107Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":319165,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/319165/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T11:06:45.928142Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in gulpfile.js\nAuto-merging gulpfile.js\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .prettierrc.js\nAuto-merging .prettierrc.js\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in src/styles/comapnionmanager.css\nAuto-merging src/styles/comapnionmanager.css\nCONFLICT (add/add): Merge conflict in src/scripts/preloadTemplates.js\nAuto-merging src/scripts/preloadTemplates.js\nCONFLICT (add/add): Merge conflict in src/scripts/main.js\nAuto-merging src/scripts/main.js\nCONFLICT (add/add): Merge conflict in src/scripts/macros.js\nAuto-merging src/scripts/macros.js\nCONFLICT (add/add): Merge conflict in src/scripts/lib/lib.js\nAuto-merging src/scripts/lib/lib.js\nCONFLICT (add/add): Merge conflict in src/scripts/custombindings.js\nAuto-merging src/scripts/custombindings.js\nCONFLICT (add/add): Merge conflict in src/scripts/constants.js\nAuto-merging src/scripts/constants.js\nCONFLICT (add/add): Merge conflict in src/scripts/config.js\nAuto-merging src/scripts/config.js\nCONFLICT (add/add): Merge conflict in src/scripts/companionmanager.js\nAuto-merging src/scripts/companionmanager.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/pf2e.js\nAuto-merging src/scripts/autoevocations/pf2e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/dnd5e.js\nAuto-merging src/scripts/autoevocations/dnd5e.js\nCONFLICT (add/add): Merge conflict in src/scripts/autoevocations/automatedevocations.js\nAuto-merging src/scripts/autoevocations/automatedevocations.js\nCONFLICT (add/add): Merge conflict in src/scripts/api.js\nAuto-merging src/scripts/api.js\nCONFLICT (add/add): Merge conflict in src/module.json\nAuto-merging src/module.json\nCONFLICT (add/add): Merge conflict in src/languages/fr.json\nAuto-merging src/languages/fr.json\nCONFLICT (add/add): Merge conflict in package.json\nAuto-merging package.json\nCONFLICT (add/add): Merge conflict in package-lock.json\nAuto-merging package-lock.json\nCONFLICT (add/add): Merge conflict in gulpfile.js\nAuto-merging gulpfile.js\nCONFLICT (add/add): Merge conflict in changelog.md\nAuto-merging changelog.md\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .prettierrc.js\nAuto-merging .prettierrc.js\n (1)","status":"interactive rebase in progress; onto 688b107\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on '688b107'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .prettierrc.js\n\tboth added: README.md\n\tboth added: changelog.md\n\tboth added: gulpfile.js\n\tboth added: package-lock.json\n\tboth added: package.json\n\tboth added: src/languages/fr.json\n\tboth added: src/module.json\n\tboth added: src/scripts/api.js\n\tboth added: src/scripts/autoevocations/automatedevocations.js\n\tboth added: src/scripts/autoevocations/dnd5e.js\n\tboth added: src/scripts/autoevocations/pf2e.js\n\tboth added: src/scripts/companionmanager.js\n\tboth added: src/scripts/config.js\n\tboth added: src/scripts/constants.js\n\tboth added: src/scripts/custombindings.js\n\tboth added: src/scripts/lib/lib.js\n\tboth added: src/scripts/macros.js\n\tboth added: src/scripts/main.js\n\tboth added: src/scripts/preloadTemplates.js\n\tboth added: src/styles/comapnionmanager.css\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n"},"id":317259,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/317259/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T11:06:44.503786Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":317258,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/317258/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T11:01:36.213022Z","action":14,"target":"","old":"","details":{"auto":true},"id":316808,"action_name":"Component locked","url":"https://weblate.foundryvtt-hub.com/api/changes/316808/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T11:01:36.193302Z","action":47,"target":"","old":"","details":{"alert":"MergeFailure"},"id":316807,"action_name":"Alert triggered","url":"https://weblate.foundryvtt-hub.com/api/changes/316807/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T11:01:36.171458Z","action":23,"target":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)","old":"","details":{"error":"Rebasing (1/15)\nerror: could not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm \", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\nCould not apply c316e34... Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in .github/workflows/main.yml\nAuto-merging .github/workflows/main.yml\n (1)","status":"interactive rebase in progress; onto f1f2dbf\nLast command done (1 command done):\n pick c316e34 Merge branch 'master' of https://github.com/theripper93/automated-evocations and version 1.6.9\nNext commands to do (14 remaining commands):\n pick a7789b6 Translated using Weblate (French)\n pick 3dada62 beta\n (use \"git rebase --edit-todo\" to view and edit)\nYou are currently rebasing branch 'master' on 'f1f2dbf'.\n (fix conflicts and then run \"git rebase --continue\")\n (use \"git rebase --skip\" to skip this patch)\n (use \"git rebase --abort\" to check out the original branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: .editorconfig\n\tnew file: .eslintignore\n\tnew file: .eslintrc\n\tnew file: .github/ISSUE_TEMPLATE/bug_report.md\n\tnew file: .github/ISSUE_TEMPLATE/feature_request.md\n\tnew file: .github/ISSUE_TEMPLATE/styling.md\n\tnew file: .github/workflows/release.yml\n\tnew file: .gitignore\n\tnew file: .prettierrc.js\n\tnew file: changelog.md\n\tnew file: foundryconfig.json\n\tnew file: gulpfile.js\n\tnew file: jsdoc-conf.json\n\tnew file: package-lock.json\n\tnew file: package.json\n\tnew file: src/assets/animations/JB2A/BardicInspiration_01_Regular_GreenOrange_400x400.webm\n\tnew file: src/assets/animations/JB2A/Conjuration_01_Yellow_Circle_800x800.webm\n\tnew file: src/assets/animations/JB2A/Darkness_01_Black_600x600.webm\n\tnew file: src/assets/animations/JB2A/Explosion_02_Blue_400x400.webm\n\tnew file: src/assets/animations/JB2A/IceSpikesRadialBurst_01_Regular_White_1000x1000.webm\n\tnew file: src/assets/animations/JB2A/Impact_12_Regular_Blue_400x400.webm\n\tnew file: src/assets/animations/JB2A/LightningBall_01_Regular_Blue_400x400.webm\n\tnew file: src/assets/animations/JB2A/LightningStrike_01a_800x800.webm\n\tnew file: src/assets/animations/JB2A/OutPulse_01_Regular_BlueWhite_Burst_600x600.webm\n\tnew file: src/assets/animations/JB2A/SnowflakeBurst_01_Regular_BlueWhite_Burst_600x600.webm\n\tnew file: src/assets/animations/JB2A/Whirlwind_01_BlueGrey_01_400x400.webm\n\tnew file: src/assets/animations/air_infinity_RECTANGLE_01.webm\n\tnew file: src/assets/animations/air_portal_CIRCLE_01.webm\n\tnew file: src/assets/animations/air_puff_CIRCLE_01.webm\n\tnew file: src/assets/animations/create_water_CIRCLE_01.webm\n\tnew file: src/assets/animations/electric_blast_01.webm\n\tnew file: src/assets/animations/energy_ball_CIRCLE.webm\n\tnew file: src/assets/animations/energy_blasts_SQUARE_01.webm\n\tnew file: src/assets/animations/energy_pulse_yellow_CIRCLE.webm\n\tnew file: src/assets/animations/energy_spark_CIRCLE_01.webm\n\tnew file: src/assets/animations/fire_earth_explosion_CIRCLE_01.webm\n\tnew file: src/assets/animations/fire_spiral_CIRCLE_01.webm\n\tnew file: src/assets/animations/four_element_strike_SQUARE_01.webm\n\tnew file: src/assets/animations/heart_red_SQUARE.webm\n\tnew file: src/assets/animations/magic_explosion_symbol_CIRCLE.webm\n\tnew file: src/assets/animations/magic_symbol_SQUARE_05.webm\n\tnew file: src/assets/animations/music_RECTANGLE.webm\n\tnew file: src/assets/animations/ring_CIRCLE_01.webm\n\tnew file: src/assets/animations/water_blast_RAY_01.webm\n\tnew file: src/assets/animations/weird_SQUARE_01.webm\n\tnew file: src/assets/black-hole-bolas.psd\n\tnew file: src/assets/black-hole-bolas.svg\n\tnew file: src/assets/black-hole-bolas.webp\n\tnew file: src/assets/boomerang-sun.svg\n\tnew file: src/assets/fvtt-ouroboros.webp\n\tnew file: src/assets/portal.svg\n\tnew file: src/automated-evocations-variant.js\n\tnew file: src/icons/skills/ice_10.jpg\n\tnew file: src/icons/skills/red_29.jpg\n\tnew file: src/icons/skills/violet_28.jpg\n\tnew file: src/icons/skills/weapon_13.jpg\n\tnew file: src/icons/skills/yellow_08.jpg\n\tnew file: src/icons/spells/enchant-magenta-2.jpg\n\tnew file: src/icons/spells/fireball-eerie-3.jpg\n\tnew file: src/icons/spells/haste-sky-3.jpg\n\tnew file: src/icons/spells/light-air-fire-3.jpg\n\tnew file: src/icons/spells/slice-orange-3.jpg\n\tnew file: src/icons/spells/wild-eerie-3.jpg\n\tnew file: src/languages/de.json\n\tnew file: src/languages/en.json\n\tnew file: src/languages/fr.json\n\tnew file: src/languages/ja.json\n\tnew file: src/module.json\n\tnew file: src/packs/actors.db\n\tnew file: src/packs/macros.db\n\tnew file: src/scripts/api.js\n\tnew file: src/scripts/autoevocations/automatedevocations.js\n\tnew file: src/scripts/autoevocations/dnd5e.js\n\tnew file: src/scripts/autoevocations/pf2e.js\n\tnew file: src/scripts/automatedEvocationsVariantModels.js\n\tnew file: src/scripts/companionmanager.js\n\tnew file: src/scripts/config.js\n\tnew file: src/scripts/constants.js\n\tnew file: src/scripts/custombindings.js\n\tnew file: src/scripts/lib/lib.js\n\tnew file: src/scripts/macros.js\n\tnew file: src/scripts/main.js\n\tnew file: src/scripts/preloadTemplates.js\n\tnew file: src/scripts/socket.js\n\tnew file: src/styles/comapnionmanager.css\n\tnew file: src/styles/spellconfig.css\n\tnew file: src/templates/companionmanager.hbs\n\tnew file: src/templates/custombindingconfig.hbs\n\tnew file: src/templates/custombindings.hbs\n\tnew file: src/templates/spellconfig.hbs\n\tnew file: wiki/feature_hud_ce_1.gif\n\tnew file: wiki/feature_hud_ce_1.mp4\n\nUnmerged paths:\n (use \"git restore --staged ...\" to unstage)\n (use \"git add ...\" to mark resolution)\n\tboth added: .github/workflows/main.yml\n\tboth added: README.md\n\n"},"id":316806,"action_name":"Repository rebase failed","url":"https://weblate.foundryvtt-hub.com/api/changes/316806/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T11:01:34.450218Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":316805,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/316805/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T10:37:25.069331Z","action":21,"target":"","old":"","details":{},"id":316804,"action_name":"Repository rebased","url":"https://weblate.foundryvtt-hub.com/api/changes/316804/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T10:37:24.291770Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":316803,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/316803/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T09:55:01.064930Z","action":21,"target":"","old":"","details":{},"id":316800,"action_name":"Repository rebased","url":"https://weblate.foundryvtt-hub.com/api/changes/316800/?format=json"},{"unit":null,"component":"https://weblate.foundryvtt-hub.com/api/components/automated-evocations-variant-fork/main/?format=json","translation":null,"user":null,"author":null,"timestamp":"2023-05-08T09:55:00.396267Z","action":53,"target":"","old":"","details":{"repos":["git://github.com/p4535992/foundryvtt-automated-evocations-variant","git://github.com/p4535992/foundryvtt-automated-evocations-variant.git","git@github.com:p4535992/foundryvtt-automated-evocations-variant","git@github.com:p4535992/foundryvtt-automated-evocations-variant.git","https://github.com/p4535992/foundryvtt-automated-evocations-variant","https://github.com/p4535992/foundryvtt-automated-evocations-variant.git"],"branch":"master","repo_url":"https://github.com/p4535992/foundryvtt-automated-evocations-variant","full_name":"p4535992/foundryvtt-automated-evocations-variant","service_long_name":"GitHub"},"id":316799,"action_name":"Repository notification received","url":"https://weblate.foundryvtt-hub.com/api/changes/316799/?format=json"}]}