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

Nanofab 2.0 #27106

Merged
merged 27 commits into from
Dec 24, 2018
Merged

Nanofab 2.0 #27106

merged 27 commits into from
Dec 24, 2018

Commits on Jul 29, 2018

  1. Nanofabricator-Preliminary

    @John-Candlebury
    John-Candlebury committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    2477405 View commit details
    Browse the repository at this point in the history

  2. Small corrections to item group

    @John-Candlebury
    John-Candlebury committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    31d1ad5 View commit details
    Browse the repository at this point in the history

  3. Json corrections

    @John-Candlebury
    John-Candlebury committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    c165592 View commit details
    Browse the repository at this point in the history

  4. Add price

    @John-Candlebury
    John-Candlebury committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    c7a6dcb View commit details
    Browse the repository at this point in the history

  5. Item drops

    @John-Candlebury
    John-Candlebury committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    694291d View commit details
    Browse the repository at this point in the history

  6. Lab Finale and Json corrections

    @John-Candlebury
    John-Candlebury committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    613de65 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Merge remote-tracking branch 'upstream/master' into nano-fabricator

    @John-Candlebury
    John-Candlebury committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    d6621c2 View commit details
    Browse the repository at this point in the history

  2. Better descriptions, balance 

    The fact that the nanofabricator doesnt use nanobots should be more clear now. Greatly reduce nanomaterials obtained from destroying the fabricator.
    @John-Candlebury
    John-Candlebury committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    b996711 View commit details
    Browse the repository at this point in the history

  3. Finale layout corrections 

    Change loot, ensure that important parts of the layout are not overwritten
    @John-Candlebury
    John-Candlebury committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    1a5f000 View commit details
    Browse the repository at this point in the history

  4. correct translation mistake

    @John-Candlebury
    John-Candlebury committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    9de88bc View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2018

  1. Prices and Trader_avoid

    @John-Candlebury
    John-Candlebury committed Aug 2, 2018
    Configuration menu
    Copy the full SHA
    c570ada View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. Merge branch 'nano-fabricator' into nanofab-2.0

    @John-Candlebury
    John-Candlebury committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    6776bd5 View commit details
    Browse the repository at this point in the history

  2. Code-Style 

    Style code
    @John-Candlebury
    John-Candlebury committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    7f6474f View commit details
    Browse the repository at this point in the history

  3. Map-changes and fix 

    Map related changes
    @John-Candlebury
    John-Candlebury committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    dd784da View commit details
    Browse the repository at this point in the history

  4. Format terrain.json 

    Format terrain.json
    @John-Candlebury
    John-Candlebury committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    9ef1fdc View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2018

  1. Suggested change src/item.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @BevapDin @John-Candlebury
    BevapDin and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    f540c73 View commit details
    Browse the repository at this point in the history

  2. Suggested change src/iexamine.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @BevapDin @John-Candlebury
    BevapDin and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    1726211 View commit details
    Browse the repository at this point in the history

  3. Suggested change src/iexamine.cpp II 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @BevapDin @John-Candlebury
    BevapDin and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    9c73405 View commit details
    Browse the repository at this point in the history

  4. Fix item spawning

    @John-Candlebury
    John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    56c7b7d View commit details
    Browse the repository at this point in the history

  5. Properly add recipes to the template

    @John-Candlebury
    John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    bb77484 View commit details
    Browse the repository at this point in the history

  6. Update src/iexamine.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @ZhilkinSerg @John-Candlebury
    ZhilkinSerg and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    65db18e View commit details
    Browse the repository at this point in the history

  7. Update src/iexamine.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @ZhilkinSerg @John-Candlebury
    ZhilkinSerg and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    966ee55 View commit details
    Browse the repository at this point in the history

  8. Update src/iexamine.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @ZhilkinSerg @John-Candlebury
    ZhilkinSerg and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    e7b6b7b View commit details
    Browse the repository at this point in the history

  9. Update src/iexamine.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @ZhilkinSerg @John-Candlebury
    ZhilkinSerg and John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    2bbe79e View commit details
    Browse the repository at this point in the history

  10. Remove unecessary data

    @John-Candlebury
    John-Candlebury committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    befb689 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Update src/iexamine.cpp 

    Co-Authored-By: John-Candlebury <John-Candlebury@users.noreply.github.com>
    @Night-Pryanik @John-Candlebury
    Night-Pryanik and John-Candlebury committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    0047963 View commit details
    Browse the repository at this point in the history

  2. Merge lines in iexamine.cpp

    @John-Candlebury
    John-Candlebury committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    7edccc9 View commit details
    Browse the repository at this point in the history