Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Magiclism herbs #2

Merged
merged 6 commits into from
Feb 6, 2022
Merged

Magiclism herbs #2

merged 6 commits into from
Feb 6, 2022

Commits on Jan 16, 2020

  1. Magical plants and where to find them 

    in the swamp
    @John-Candlebury
    John-Candlebury committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    10d4ccc View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-Authored-By: LaVeyanFiend <[email protected]>
    @John-Candlebury
    John-Candlebury and LaVeyanFiend authored Jan 16, 2020
    Configuration menu
    Copy the full SHA
    f7db0d4 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2020

  1. More plants

    @John-Candlebury
    John-Candlebury committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    e45569c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'magiclism-herbs' of https://github.com/John-Candlebury/… 

    …Cataclysm-DDA into magiclism-herbs
    @John-Candlebury
    John-Candlebury committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    82b9652 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2020

  1. Update data/mods/Magiclysm/items/herbs_and_flowers.json 

    Co-Authored-By: anothersimulacrum <[email protected]>
    @John-Candlebury @anothersimulacrum
    John-Candlebury and anothersimulacrum authored Jan 19, 2020
    Configuration menu
    Copy the full SHA
    65d7142 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2020

  1. Add flower items and tweak descriptions

    @John-Candlebury
    John-Candlebury committed Jan 26, 2020
    Configuration menu
    Copy the full SHA
    ccb44c5 View commit details
    Browse the repository at this point in the history