diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ce14736c..00000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: java -dist: trusty -branches: - only: - - rv3-1.7.10 -jdk: - - oraclejdk8 -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - "$HOME/.gradle/caches/" - - "$HOME/.gradle/wrapper/" -install: "./gradlew setupCIWorkspace" -script: "./gradlew build test" -deploy: - provider: releases - api_key: - secure: hoIOb6WkNbwuv1T67zh4Gj1YPG2IhYzstd5m5JtbzQdAxGd/9w55tRtk6TxmHGlFnj2UR3hsvNH6LT6pUTqHUCR29LnMQwLBZUyUDYm+sg0sF26sv1FkORZrzuV0n+v3EBkDuQxuUjfzEXtPfZen4mca3EpTz2lKRm9f7Xt38yGWW3CLdgplD06N6SU2m+3f1tIneSZ5oNrKuZd6407yrS1l6UN14Z5vqmPiXga6LW+ryKhAmREULOZJSJOX7wrvGGMddMjVbySlJBz3LYPEf8ow15f5UQJ4MMu46wswSnKpDkwBelwZa/vweuGsbCmX2i0G4pO7675tHGySez1VAVK6itc4awqVRd4DHGt5X0++7nyeRLMbh/35Llsjm4QyFzepBOf2UoTVdEb6ATGVcZ4PExm3zVX3IdEw/2OweB5IkXZkYWnDnTCczfKT3AtvEyZH+6CKVFdW5KNbgWtur98uGAIuVI9T8/B4vKyfa0JfWzrtlLBdPWev4LvUsX5laOTkbmH+2K/cURVPaqX2VtMzQiM3dJvp/kwEtaRHVpift/yEyaqpHcnUmJ1rGWqkWlHfxabAQaRyWyCGsfVfmGwPJUkuHAXvKHP77MfsEsbEHlECHP8DXZfM4sm3eZiCT62Cni0JV3iIZDqolk0QLWQ84RtbbUBm1f64M/ErBSE= - file_glob: true - file: build/libs/* - skip_cleanup: true - on: - tags: true - repo: xsun2001/Applied-Energistics-2-Unofficial - branch: rv3-1.7.10 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 212bdffd..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,165 +0,0 @@ -# How to contribute - -We want to keep it as easy as possible to contribute changes to support -the growth and stability of AE2. There are a few guidelines that we -need contributors to follow so that we can have a chance of keeping on -top of things. - -## Getting Started - -### Reporting an Issue - -Applied Energistics 2 crashing, have a suggestion, found a bug? Create an issue now! - -1. Make sure your issue has not already been answered or fixed and you are using the latest version. Also think about whether your issue is a valid one before submitting it. -2. Go to [the issues page](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues) and click [new issue](https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/new) -3. Enter your a title of your issue (something that summarizes your issue), and then create a detailed description of the issue. - * Do not tag it with something like `[Feature]` or `[Bug]`. When it is applicable, we will take care of it. - * The following details are required. Not including them can cause the issue to be closed. - * Forge version - * AE2 version - * Crash log, when reporting a crash (Please make sure to use [pastebin](http://pastebin.com/)) - * Do not post an excerpt of what you consider important, instead: - * Post the full log - * Other mods and their version, when reporting an issue between AE and another mod - * Also consider updating these before submitting a new issue, it might be already fixed - * A detailed description of the bug or feature - * To further help in resolving your issues please try to include the follow if applicable: - * What was expected? - * How to reproduce the problem? - * This is usually a great detail and allows us to fix it way faster - * Server or Single Player? - * Screen shots or Pictures of the problem - * Mod Pack using and version? - * Keep in mind that some mods might use an outdated version of AE2 - * If so you should report it to your modpack -5. Click `Submit New Issue`, and wait for feedback! - -Providing as many details as possible does help us to find and resolve the issue faster and also you getting a fixed version as fast as possible. - -### Submitting Changes - -* Submit an issue to the github project, assuming one does not already exist. - * Clearly describe the issue including steps to reproduce when it is a bug. - * Make sure you fill in the earliest version that you know has the issue. -* Fork the repository on GitHub -* Create a topic branch from where you want to base your work. - * This is revison branch that is under active development. - * Only target release branches if you are certain your fix must be on that - branch. - * To quickly create a topic branch based on the development branch; `git - checkout -b fix/master/my_contribution branch`. Please avoid working - directly on the `active development` branch. -* Make commits of logical units. -* Check for unnecessary whitespace with `git diff --check` before committing. -* Make sure your commit messages are in the proper format. - -```` - (#12345) Make the example in CONTRIBUTING imperative and concrete - - Without this patch applied the example commit message in the CONTRIBUTING - document is not a concrete example. This is a problem because the - contributor is left to imagine what the commit message should look like - based on a description rather than an example. This patch fixes the - problem by making the example concrete and imperative. - - The first line is a real life imperative statement with a ticket number - from our issue tracker. The body describes the behavior without the patch, - why this is a problem, and how the patch fixes the problem when applied. -```` -* Always fully test your changes. If they are large engouh in scope, then fully test AE2. -* Describing the process you used to test your changes in detail will help speed up this process. - -## Making Trivial Changes - -### Documentation - -For changes of a trivial nature to comments and documentation, it is not -always necessary to create a new issue. In this case, it is -appropriate to start the first line of a commit with '(doc)' instead of -a ticket number. - -```` - (doc) Add documentation commit example to CONTRIBUTING - - There is no example for contributing a documentation commit - to the Puppet repository. This is a problem because the contributor - is left to assume how a commit of this nature may appear. - - The first line is a real life imperative statement with '(doc)' in - place of what would have been the ticket number in a - non-documentation related commit. The body describes the nature of - the new documentation or comments added. -```` - -### Semantic Changes - -In order to keep the code in a state where PRs can be safely merged, it is important to -avoid changes to syntax or changes that don't add any real value to the code base. PRs -that make changes only to syntax or "clean up" the code will be rejected. Any code clean-up -should be coordinated with the core team first. - - -## Style Guidelines - -Applied Energistics does not follow standard Java syntax. The guidelines below illustrate -the styling guidelines used by AE. - -PRs that do not conform to these standards will be rejected. - -You can find presets for Eclipse and IntelliJ IDEA in the `codeformat` folder. -We try to keep them up to date, but in case you find them not formatting it correctly, then please report it - -### Whitespace - -#### Tabs or spaces -Configure your IDE to use tabs as padding whitespace. Ensure that there is no extra whitespace -at the end of lines, or on blank lines. - -#### Pad parenthes with whitespace -```` -if( item.equals( newItem ) - -public void DeleteItem( item ) - -catch( Throwable ) -```` - -### Braces - -Place opening and closing braces on a new line. Always include open and close braces, even if -the body is a single line. - -```` -if( item.equals( newItem ) -{ - -} -else -{ - -} - -public void DeleteItem( item ) -{ - -} -```` - -## Submitting Changes - -* Push your changes to a topic branch in your fork of the repository. -* Submit a pull request to the repository in the puppetlabs organization. -* Update your issue to mark that you have submitted code and are ready for it to be reviewed. - * Include a link to the pull request in the ticket. -* The core team looks at Pull Requests on a regular basis. - * There are many reasons why it will take a long time to pull your PR. Be patient, we'll - get to it. -* After feedback has been given we expect responses within two weeks. After two - weeks will may close the pull request if it isn't showing any activity. - -# Additional Resources - -* [General GitHub documentation](http://help.github.com/) -* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) -* #AppliedEnergistics IRC channel on esper.net diff --git a/codeformat/ae2-intellij-settings.jar b/codeformat/ae2-intellij-settings.jar deleted file mode 100644 index 7cde8968..00000000 Binary files a/codeformat/ae2-intellij-settings.jar and /dev/null differ diff --git a/codeformat/checkstyle.xml b/codeformat/checkstyle.xml deleted file mode 100644 index 2a6bebe2..00000000 --- a/codeformat/checkstyle.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/codeformat/copyright.txt b/codeformat/copyright.txt deleted file mode 100644 index 5654ca52..00000000 --- a/codeformat/copyright.txt +++ /dev/null @@ -1,15 +0,0 @@ -This file is part of Applied Energistics 2. -Copyright (c) 2013 - $today.year, AlgorithmX2, All rights reserved. - -Applied Energistics 2 is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Applied Energistics 2 is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with Applied Energistics 2. If not, see . \ No newline at end of file diff --git a/codeformat/eclipse-code-format.xml b/codeformat/eclipse-code-format.xml deleted file mode 100644 index e8a1dd36..00000000 --- a/codeformat/eclipse-code-format.xml +++ /dev/null @@ -1,295 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/codeformat/eclipse.importorder b/codeformat/eclipse.importorder deleted file mode 100644 index e78604fe..00000000 --- a/codeformat/eclipse.importorder +++ /dev/null @@ -1,11 +0,0 @@ -#Organize Import Order -#Sat Jun 13 15:22:41 CEST 2015 -8=appeng -7= -6=cpw -5=net -4=io -3=org -2=com -1=javax -0=java