gcs_master_library
gcs_master_library copied to clipboard
richardwilkes
HUGE update to Dungeon Fantasy
Changelog:
Basic: Equipment: Added some missing equipments (all of the Clothing Items and the Scribing Kit) Trait: Included some missing modifiers and options from the DF books.
DF1: Added all the Equipment modifiers from DF1. Refactored and cleaned all the DF1 templates, so that now they have the same layout. Added all of the missing loadouts from DF13. EDIT: Moved the Duelist and Sorcerer class to DFD:Swasbucklers and Pyramid 82, respectively.
DF4: Added the missing Scholar template. Refactored and cleaned all the templates, so that now they have the same layout of the DF1 ones. Added loadouts to both Artificier and Scholar. Added the Artificer lenses (the Scholar one are still missing).
DF9: Refactored and cleaned all the DF9 templates, so that now they have the same layout of the DF1 ones. Added all of the missing loadouts from DF13. (Note: for some reasons the old commits you've already pulled, concering the missing templates from DF9 seem to still be visible in this pull request: don't know why).
DF10: Added all of the missing loadouts from DF13 to the Innkeeper template. Refactored and cleaned all the templates, so that now they have the same layout of the DF1 ones.
DF12: Added all the equipment from DF12 to the library. Added all of the missing loadouts from DF13. Refactored and cleaned all the templates, so that now they have the same layout of the DF1 ones.
DF13: Added all the equipment from DF13 to the library.
The branch is reporting conflicts in files you previously committed. I'm guessing you didn't start a new branch and instead continued on with the branch you used for the previous PR. That usually causes this sort of problem. Depending on the actual conflicts, it might be easier to squirrel these changes away, nuke your old repo, fork the master library again, apply your saved changes, then create a new PR.
The conflicts are Easy to solve. Overwrite everything in the previois commit. This last One Is incremental.
Il ven 28 lug 2023, 23:20 Richard Wilkes @.***> ha scritto:
The branch is reporting conflicts in files you previously committed. I'm guessing you didn't start a new branch and instead continued on with the branch you used for the previous PR. That usually causes this sort of problem. Depending on the actual conflicts, it might be easier to squirrel these changes away, nuke your old repo, fork the master library again, apply your saved changes, then create a new PR.
— Reply to this email directly, view it on GitHub https://github.com/richardwilkes/gcs_master_library/pull/235#issuecomment-1656345769, or unsubscribe https://github.com/notifications/unsubscribe-auth/AHQ4JNEK35CYB3T5N5SEAD3XSQUH7ANCNFSM6AAAAAA2XX22HE . You are receiving this because you authored the thread.Message ID: @.***>
I have no idea how to do It... could you do It? You can simply force overwrite everything in this case.
Il gio 21 set 2023, 23:00 Richard Wilkes @.***> ha scritto:
I'm happy to merge this once the conflicts have been resolved.
— Reply to this email directly, view it on GitHub https://github.com/richardwilkes/gcs_master_library/pull/235#issuecomment-1730295604, or unsubscribe https://github.com/notifications/unsubscribe-auth/AHQ4JNHI26P6UIC4K2C6RNDX3STGZANCNFSM6AAAAAA2XX22HE . You are receiving this because you authored the thread.Message ID: @.***>
I'm afraid the current conflicts are too severe for me to know what should be done. The suggestion I made on July 28 is probably the only way to resolve this correctly.