Skip to content
This repository has been archived by the owner on Aug 20, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottKillen committed Feb 21, 2015
2 parents 5c4e558 + 408671a commit d911a93
Show file tree
Hide file tree
Showing 61 changed files with 2,263 additions and 16 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Scott's Tweaks
**LATEST OFFICIAL VERSION**: [Scott's Tweaks 1.1.0 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all releases][releases])<br />
*DEPENDS ON*: [Kore Sample 1.2.2 (or later) for MC 1.7.10][koresample]
**LATEST OFFICIAL VERSION**: [Scott's Tweaks 1.2.0 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all releases][releases])<br />
*DEPENDS ON*: [Kore Sample 1.2.5 (or later) for MC 1.7.10][koresample]
[latest]: https://github.com/MinecraftModArchive/ScottsTweaks/releases/latest
[releases]: https://github.com/MinecraftModArchive/ScottsTweaks/releases
[changelog.md]: https://github.com/MinecraftModArchive/ScottsTweaks/blob/develop/src/main/resources/CHANGELOG.md
Expand All @@ -13,6 +13,7 @@ Scott's Tweaks adds several of my favorite gameplay tweaks to the game.
- Live chickens drop feathers as they go about their lives.
- Growables (saplings, etc.) plant themselves if possible.
- Clay generates in the overworld (not just in lake bottoms).
- Squid and bat spawning can be reduced or disabled.

[Contributing](#contributing)

Expand Down
135 changes: 135 additions & 0 deletions api/KoreSample/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
# Adapted from http://www.gitignote.io

### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp


### OSX ###
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk



### Linux ###
*~

# KDE directory preferences
.directory


### Java ###
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*


### Eclipse ###
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath

# sbteclipse plugin
.target

# TeXlipse plugin
.texlipse


### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm

## Directory-based project format
.idea/
/*.iml

## File-based project format
*.ipr
*.iws

## Additional for IntelliJ
out/

# generated by mpeltonen/sbt-idea plugin
.idea_modules/

# generated by JIRA plugin
atlassian-ide-plugin.xml

# generated by Crashlytics plugin (for Android Studio and Intellij)
com_crashlytics_export_strings.xml


### Project ###
.classpath
.project
run/

### Gradle ###
.gradle
build/

# Ignore Gradle GUI config
gradle-app.setting
43 changes: 43 additions & 0 deletions api/KoreSample/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#Contributing

We love pull requests. Here is a quick guide:

To get started, [sign the Contributor License Agreement][cla]. This project is in the public domain and we need you to agree that your submissions will also be in the public domain. See [unlicense.org](http://unlicense.org/).

[cla]: https://www.clahub.com/agreements/MinecraftModArchive/KoreSample

Fork, then clone the repo:

git clone [email protected]:your-username/KoreSample.git

Check out the development branch:

git checkout develop

Set up your development environment:

gradlew setupDecompWorkspace

Setup your integrated development environment:

gradlew idea

-or-

gradlew eclipse

Make your changes.

Push to your fork and [submit a pull request][pr].

[pr]: https://github.com/MinecraftModArchive/KoreSample/compare/

At this point, things are waiting on us. We may merge your code as is. We may suggest some changes or improvements or alternatives.

###Some things that will increase the chance thate your pull request is accepted:

* Write logical, thought out code.
* Reuse your code.
* Write a [good commit message][commit].

[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
67 changes: 67 additions & 0 deletions api/KoreSample/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
## Kore Sample
**LATEST OFFICIAL VERSION**: [Kore Sample 1.2.5 for MC 1.7.10][latest] ([changelog][changelog.md]) ([all releases][releases])
[latest]: https://github.com/MinecraftModArchive/KoreSample/releases/latest
[releases]: https://github.com/MinecraftModArchive/KoreSample/releases
[changelog.md]: https://github.com/MinecraftModArchive/KoreSample/blob/develop/src/main/resources/CHANGELOG.md

![KoreSample](https://raw.githubusercontent.com/MinecraftModArchive/KoreSample/develop/src/main/resources/assets/logo.png)

Kore Sample provides a set of tools and base classes for other Minecraft mods that depend on it.

[Contributing](#contributing)

[Support](#support)

[Mod Packs](#mod-packs)

[Licensing](#licensing)

### Contributing

Please see [CONTRIBUTING.md](CONTRIBUTING.md).

### Support
Something not quite right? Have a suggestion? Found a bug? Create an issue now!

1. Make sure your issue hasn't already been answered or fixed. Also think about whether your issue is a valid one
before submitting it.
2. Go to [the issues page][issues].
3. Click [`New Issue`][new] right below `Star` and `Fork`.
4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description ("Hey, could
you add/change xxx?" or "Hey, I found an exploit.", etc.).
5. Click `Submit new issue`, and wait for feedback!

[issues]: /MinecraftModArchive/KoreSample/issues
[new]: /MinecraftModArchive/KoreSample/issues/new

* * *

#### Mod Packs

This mod is released to the public domain. (*See [below](#licensing).*) The authors have disclaimed all rights and
anyone can use this software and source code as they wish. This means that anyone has permission to distribute this
compiled mod in any form, including bundled with other mods in a "mod pack." In fact, this mod was written with that
purpose in mind.

* * *

#### Licensing

This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or distribute this software, either in source code form or
as a compiled binary, for any purpose, commercial or non-commercial, and by any means.

In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright
interest in the software to the public domain. We make this dedication for the benefit of the public at large and to the
detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of
all present and future rights to this software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to [unlicense.org](http://unlicense.org/).

![Public Domain](https://raw.githubusercontent.com/MinecraftModArchive/assets/master/pd-icon.png)
25 changes: 25 additions & 0 deletions api/KoreSample/UNLICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org>

Loading

0 comments on commit d911a93

Please sign in to comment.