Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jaquadro/GardenCollection
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: st-1.2.5
Choose a base ref
...
head repository: jaquadro/GardenCollection
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
5 contributors

Commits on Aug 17, 2014

  1. Ivy block

    @jaquadro
    jaquadro committed Aug 17, 2014
    Copy the full SHA
    af486c6 View commit details

Commits on Feb 12, 2015

  1. Initial Botania integration; add binding to fix some proxy behaviors

    @jaquadro
    jaquadro committed Feb 12, 2015
    Copy the full SHA
    73d94f3 View commit details

Commits on Feb 13, 2015

  1. Slightly more efficient proxy binding

    @jaquadro
    jaquadro committed Feb 13, 2015
    Copy the full SHA
    f99cc25 View commit details

  2. Thaumcraft plant and tree integration

    @jaquadro
    jaquadro committed Feb 13, 2015
    Copy the full SHA
    b8356b0 View commit details

Commits on Feb 14, 2015

  1. ExtraBiomesXL Integration

    @jaquadro
    jaquadro committed Feb 14, 2015
    Copy the full SHA
    2cff0e0 View commit details

  2. Less invasive version number updates in the future.

    @jaquadro
    jaquadro committed Feb 14, 2015
    Copy the full SHA
    8dbe30b View commit details

Commits on Feb 15, 2015

  1. Implement proper binding stack for garden proxy

    @jaquadro
    jaquadro committed Feb 15, 2015
    Copy the full SHA
    0492efd View commit details

Commits on Feb 16, 2015

  1. Highlight compatible items in GUIs

    @jaquadro
    jaquadro committed Feb 16, 2015
    Copy the full SHA
    9666f1f View commit details

  2. Add food and string to compost list

    @jaquadro
    jaquadro committed Feb 16, 2015
    Copy the full SHA
    26bbd03 View commit details

  3. Allow third party hoe tools (TCon mattock) on large pots.

    @jaquadro
    jaquadro committed Feb 16, 2015
    Copy the full SHA
    5de0a50 View commit details

  4. Merge branch 'ivy-block'

    @jaquadro
    jaquadro committed Feb 16, 2015
    Copy the full SHA
    162cc39 View commit details

  5. Tweak growth of added Ivy block

    @jaquadro
    jaquadro committed Feb 16, 2015
    Copy the full SHA
    6e08c42 View commit details

  6. TCon axe support in wood post recipes. Wood post fence recipe a littl… 

    …e cheaper.
    @jaquadro
    jaquadro committed Feb 16, 2015
    Copy the full SHA
    8668039 View commit details

Commits on Feb 17, 2015

  1. Move GardenDecor into main project area

    @jaquadro
    jaquadro committed Feb 17, 2015
    Copy the full SHA
    e361467 View commit details

  2. Remove old GardenDecor location

    @jaquadro
    jaquadro committed Feb 17, 2015
    Copy the full SHA
    a90122d View commit details

  3. Merge GardenTrees into main project area

    @jaquadro
    jaquadro committed Feb 17, 2015
    Copy the full SHA
    d060806 View commit details

  4. Merge GardenContainers into main project area

    @jaquadro
    jaquadro committed Feb 17, 2015
    Copy the full SHA
    e1c1b90 View commit details

  5. Restructure project

    @jaquadro
    jaquadro committed Feb 17, 2015
    Copy the full SHA
    bf46d05 View commit details

Commits on Feb 18, 2015

  1. API refactoring

    @jaquadro
    jaquadro committed Feb 18, 2015
    Copy the full SHA
    941643b View commit details

  2. More API work.

    @jaquadro
    jaquadro committed Feb 18, 2015
    Copy the full SHA
    db52d4a View commit details

Commits on Feb 19, 2015

  1. Use correct metadata for farmland substrate

    @jaquadro
    jaquadro committed Feb 19, 2015
    Copy the full SHA
    4ab52e4 View commit details

  2. Stage more AgriCraft integration

    @jaquadro
    jaquadro committed Feb 19, 2015
    Copy the full SHA
    0fd2869 View commit details

  3. Add bonemeal handlers for grass/fern

    @jaquadro
    jaquadro committed Feb 19, 2015
    Copy the full SHA
    2f48afc View commit details

  4. Chain rendering work

    @jaquadro
    jaquadro committed Feb 19, 2015
    Copy the full SHA
    773e9c8 View commit details

Commits on Feb 20, 2015

  1. Fix chain wireframe

    @jaquadro
    jaquadro committed Feb 20, 2015
    Copy the full SHA
    f74881d View commit details

  2. Mycelium and garden farmland substrates

    @jaquadro
    jaquadro committed Feb 20, 2015
    Copy the full SHA
    3f1447b View commit details

  3. Register extended sapling types

    @jaquadro
    jaquadro committed Feb 20, 2015
    Copy the full SHA
    15912c5 View commit details

  4. More chain variety

    @jaquadro
    jaquadro committed Feb 20, 2015
    Copy the full SHA
    263bc9a View commit details

Commits on Feb 22, 2015

  1. Chain recipes and lang entries

    @jaquadro
    jaquadro committed Feb 22, 2015
    Copy the full SHA
    5fd75e6 View commit details

Commits on Feb 26, 2015

  1. Check ore dictionary for valid tree wood types (posts and fences)

    @jaquadro
    jaquadro committed Feb 26, 2015
    Copy the full SHA
    e0c70b5 View commit details

  2. Add missing iron nugget for chains

    @jaquadro
    jaquadro committed Feb 26, 2015
    Copy the full SHA
    ac09e78 View commit details

Commits on Feb 27, 2015

  1. Fix crash when placing light chain blocks

    @jaquadro
    jaquadro committed Feb 27, 2015
    Copy the full SHA
    cb02708 View commit details

  2. Fix high-rainfall soil test kits from zeroing out.

    @jaquadro
    jaquadro committed Feb 27, 2015
    Copy the full SHA
    15ad6f6 View commit details

Commits on Feb 28, 2015

  1. Add correct block sounds; ivy can spread to pots and other non-solid … 

    …blocks with solid sides.
    @jaquadro
    jaquadro committed Feb 28, 2015
    Copy the full SHA
    344e696 View commit details

  2. Initial support for PlantMegaPack

    @jaquadro
    jaquadro committed Feb 28, 2015
    Copy the full SHA
    b1960ab View commit details

Commits on Mar 2, 2015

  1. Added rusty, black oxide, and mossy versions of chains.

    @jaquadro
    jaquadro committed Mar 2, 2015
    Copy the full SHA
    a47fe9f View commit details

  2. Add sound effect to use cauldron

    @jaquadro
    jaquadro committed Mar 2, 2015
    Copy the full SHA
    f7756f4 View commit details

  3. Added lattice blocks

    @jaquadro
    jaquadro committed Mar 2, 2015
    Copy the full SHA
    db87014 View commit details

  4. Fix broken collision on lattice

    @jaquadro
    jaquadro committed Mar 2, 2015
    Copy the full SHA
    23a1859 View commit details

Commits on Mar 6, 2015

  1. Added Garden Lantern (ooooh)

    @jaquadro
    jaquadro committed Mar 6, 2015
    Copy the full SHA
    db69e06 View commit details

Commits on Mar 7, 2015

  1. Tweak lantern stuff, updating chain API

    @jaquadro
    jaquadro committed Mar 7, 2015
    Copy the full SHA
    e1078ef View commit details

Commits on Mar 9, 2015

  1. Lots of lantern work

    @jaquadro
    jaquadro committed Mar 9, 2015
    Copy the full SHA
    ca9c7ed View commit details

  2. Language updates

    @jaquadro
    jaquadro committed Mar 9, 2015
    Copy the full SHA
    501fa92 View commit details

Commits on Mar 10, 2015

  1. Add wrought iron resource

    @jaquadro
    jaquadro committed Mar 10, 2015
    Copy the full SHA
    bb44529 View commit details

Commits on Mar 11, 2015

  1. Wrought iron fences

    @jaquadro
    jaquadro committed Mar 11, 2015
    Copy the full SHA
    9c6b90a View commit details

Commits on Mar 12, 2015

  1. Fix fence hit box / collision box

    @jaquadro
    jaquadro committed Mar 12, 2015
    Copy the full SHA
    203a5c5 View commit details

  2. Recipes and some name cleanup

    @jaquadro
    jaquadro committed Mar 12, 2015
    Copy the full SHA
    a672c69 View commit details

  3. More bulletproof implementation for breaking posts / fences

    @jaquadro
    jaquadro committed Mar 12, 2015
    Copy the full SHA
    eae5f25 View commit details

  4. Also fix the large pot

    @jaquadro
    jaquadro committed Mar 12, 2015
    Copy the full SHA
    97ee024 View commit details

  5. Lanterns retain light sources on breaking

    @jaquadro
    jaquadro committed Mar 12, 2015
    Copy the full SHA
    e00da00 View commit details
Showing 603 changed files with 20,496 additions and 7,866 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -21,3 +21,5 @@ Runtime/options.txt
*.iws
Runtime/
Images/
.gradle/
*.iml
10 changes: 0 additions & 10 deletions Build/Build.iml
View file

This file was deleted.

94 changes: 0 additions & 94 deletions Build/build.gradle
View file

This file was deleted.

167 changes: 0 additions & 167 deletions GardenCollection.ipr
View file

This file was deleted.

Loading