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.

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

JEI Support #431

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

JEI Support #431

wants to merge 19 commits into from

Commits on Aug 27, 2014

  1. - Changing scripting engine to use three-step compilation and improvi…

    …ng language
    
    - Added named method arguments and default argument values
    - Added OptionalInt, OptionalFloat, OptionalDouble, OptionalString
    Stan Hebben committed Aug 27, 2014
    Configuration menu
    Copy the full SHA
    3799725 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2014

  1. Merge branch 'master' into 3.1

    Conflicts:
    	MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java
    	MineTweaker3-API/src/main/java/minetweaker/api/game/IGame.java
    	MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java
    	MineTweaker3-API/src/main/java/minetweaker/api/item/IItemTransformer.java
    	MineTweaker3-API/src/main/java/minetweaker/api/item/IngredientTransform.java
    	MineTweaker3-API/src/main/java/minetweaker/api/recipes/ICraftingRecipe.java
    	MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java
    Stan Hebben committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    4d4d39d View commit details
    Browse the repository at this point in the history
  2. Merged with the 3.0.8 version.

    Stan Hebben committed Sep 2, 2014
    Configuration menu
    Copy the full SHA
    6726cde View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2014

  1. - Continued development on ZenScript

    - MineTweaker3-API is now MIT licensed
    - Adjusted some parts of the API towards the ZenScript changes
    - Expanded API to allow new blocks to be defined
    - Added compile-time evaluation
    - Started implementation of switch compilation
    Stan Hebben committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    5a469ac View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2014

  1. - Merged the 3.0.9 changes into the 3.1 branch

    - Continued refactoring and code quality improvement in scripting engine
    Stan Hebben committed Oct 14, 2014
    Configuration menu
    Copy the full SHA
    3a38a9d View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2014

  1. Merge branch 'master' into 3.1

    Conflicts:
    	MineTweaker3-API/src/main/java/minetweaker/api/item/IItemDefinition.java
    	MineTweaker3-API/src/main/java/minetweaker/api/item/IItemStack.java
    	MineTweaker3-API/src/main/java/minetweaker/expand/ExpandString.java
    	MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java
    	MineTweaker3-MC164-Main/src/main/java/minetweaker/mc164/MineTweakerMod.java
    	MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java
    	MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java
    	MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/MineTweakerMod.java
    	MineTweaker3-Web/downloads.html
    	MineTweaker3-Web/index.html
    	configuration.gradle
    Stan Hebben committed Oct 19, 2014
    Configuration menu
    Copy the full SHA
    b5ac337 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2014

  1. - Started spliting MineTweakerImplementation and MineTweakerImplement…

    …ationAPI
    
    - Changed formatting to new style
    - Moved zenscript to its final package (org.openzen.zencode)
    - Started work on the recipes API
    - Continued work on the scripting engine
    Stan Hebben committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    3bcfc18 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2014

  1. Merge branch 'master' into 3.1

    Conflicts:
    	MineTweaker3-API/src/main/java/minetweaker/MineTweakerAPI.java
    	MineTweaker3-API/src/main/java/minetweaker/api/item/IIngredient.java
    	MineTweaker3-API/src/main/java/minetweaker/api/liquid/ILiquidStack.java
    Stan Hebben committed Nov 9, 2014
    Configuration menu
    Copy the full SHA
    3d9b070 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2014

  1. - Continued towards a compiling (but not yet complete) version of Zen…

    …Code
    
    - Refactored and reworked the 1.7.10 implementation to fit the new ZenCode API
    - Added UndoableAction class and refactored existing code to use it
    Stan Hebben committed Nov 10, 2014
    Configuration menu
    Copy the full SHA
    ef13968 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2014

  1. - Some additional minor refactoring to the new package & structure

    - Some additional cleanup
    - Adjusted more MineTweaker-API code to the new ZenCode structure
    - Type Expansions should work with native java classes again
    - Made custom unescape function (works with the yet-unreleased ZenCode specs)
    Stan Hebben committed Nov 11, 2014
    Configuration menu
    Copy the full SHA
    e674194 View commit details
    Browse the repository at this point in the history
  2. Covered type parsing by unit tests.

    Stan Hebben committed Nov 11, 2014
    Configuration menu
    Copy the full SHA
    c3bfcdd View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. - Fixed formatting

    - Cleaned up some API functions
    - Fixed some naming between parameters and arguments
    - Fixed a few naming errors in registered API classes
    - Adjusted bracket handlers to the new system, simplified implementation
    - Stop compilation in case of errors
    - Added debug code, to output generated classes in scripts-debug
    - Fixed calling of virtual methods
    - Fixed some callable values not being processed properly
    Stan Hebben committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    57afaee View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2014

  1. - Continuing preparation of the improved scripting system. Deleted a …

    …lot of old classes, renamed/moved a lot of things.
    
    - Completing parser implementation
    - Started work on the improved ZenScript -> Java bytecode compiler
    Stan Hebben committed Dec 6, 2014
    Configuration menu
    Copy the full SHA
    c4d779c View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. - Merged changes from main branch

    - Making major strides in the scripting language towards 3.0.10 (and 3.1)
    - Added language grammar schemas
    Stan Hebben committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    e056206 View commit details
    Browse the repository at this point in the history
  2. Preparing for a properly compiling version of the improved scripting …

    …engine.
    Stan Hebben committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    9975370 View commit details
    Browse the repository at this point in the history
  3. Removed the T generic parameter everywhere, which has now become Type…

    …Instance<E>.
    Stan Hebben committed Jan 9, 2015
    Configuration menu
    Copy the full SHA
    4faf568 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. (Committing progress towards improved scripting engine)

    - Fixed all errors outside the bytecode compiler
    - Improved naming for some classes
    - Removed IGlobalScope
    - Removed some methods that are no longer necessary
    Stan Hebben committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    ec7d841 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2015

  1. Continued work on the new compiler.

    Stan Hebben committed May 15, 2015
    Configuration menu
    Copy the full SHA
    154e5c5 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2015

  1. Commit of the compiler's working status.

    Stan Hebben committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    788ede5 View commit details
    Browse the repository at this point in the history