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

Feature/#146 wines and oils #163

Merged
merged 16 commits into from
Jan 10, 2018
Merged

Feature/#146 wines and oils #163

merged 16 commits into from
Jan 10, 2018

Commits on Jun 2, 2017

  1. prepare changelog for next version

    @xirsoi
    xirsoi committed Jun 2, 2017
    Configuration menu
    Copy the full SHA
    4c3c9a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. merge develop

    @xirsoi
    xirsoi committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    67cc282 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. get started with wine and oil artifacts

    @xirsoi
    xirsoi committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    72d4d8e View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2017

  1. stuff and things

    @xirsoi
    xirsoi committed Aug 6, 2017
    Configuration menu
    Copy the full SHA
    23d3578 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2017

  1. merge:

    @xirsoi
    xirsoi committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    ae9b666 View commit details
    Browse the repository at this point in the history

  2. add skeleton of dionysian mysteries for #152

    @xirsoi
    xirsoi committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    351f058 View commit details
    Browse the repository at this point in the history

  3. more #152 work

    @xirsoi
    xirsoi committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    c9f1a5f View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. add localisations and start dionysia work

    @xirsoi
    xirsoi committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    3a3d6e4 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. merge vanilla 2.8 changes 

    cleanup still to be done, but i must sleep
    @xirsoi
    xirsoi committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    20c3752 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2017

  1. fixing of the things

    @xirsoi
    xirsoi committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    dbe182c View commit details
    Browse the repository at this point in the history

  2. lol, updates generalstuff.gfx

    @xirsoi
    xirsoi committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    2493771 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2017

  1. fixes religious icons 

    fixes atenic government
fixes the Convert to Swedish decision being deleted
disables some in development decisions
    @xirsoi
    xirsoi committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    62954e5 View commit details
    Browse the repository at this point in the history

  2. update readme

    @xirsoi
    xirsoi committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    cc75764 View commit details
    Browse the repository at this point in the history

  3. removes unnecessary on_actions entry

    @xirsoi
    xirsoi committed Nov 23, 2017
    Configuration menu
    Copy the full SHA
    82c714b View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. Merge branch 'develop' into feature/#145-wines-and-oils

    @xirsoi
    xirsoi committed Dec 19, 2017
    Configuration menu
    Copy the full SHA
    f90f3df View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. increase likelihood of Philosopher appearing and fixes the lost in sa… 

    …ndstorm event
    @xirsoi
    xirsoi committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    9e6355b View commit details
    Browse the repository at this point in the history