Commit Graph
160 Commits
Author SHA1 Message Date
Jared dea355917d Merge pull request #8 from Techlone/master
OreDict features
2016-02-19 22:41:14 +02:00
Techlone 025cb3fac1 Hotfix Choosing of method 2016-02-08 02:41:54 +05:00
Techlone 002745b377 Merge remote-tracking branch 'jaredmt/master' 2016-02-08 02:08:50 +05:00
Techlone bea9c285d0 Processing of wildcard in OreBracketHandler 2016-02-08 01:43:24 +05:00
Techlone a3347969ff New getter 'firstItem' in IOreDictEntry 2016-02-08 01:41:25 +05:00
Jared c1cb2a9782 stripped items of ' 2016-02-07 20:57:10 +02:00
Jared 0c02daf314 144 fixed 2016-02-05 17:58:32 +02:00
Jared 7163cedc8a Close #282 2016-02-02 11:14:16 +02:00
Jared 4ceb10fa88 fix missing semi colon 2016-02-02 11:07:05 +02:00
Jared 32373eb877 Merge pull request #7 from stanhebben/master
update from master
2016-02-02 11:00:00 +02:00
Jared 82546360e1 close #150 2016-02-02 10:55:00 +02:00
Jared 162c2a434e Merge pull request #308 from fluffle/catch-npe-in-recipes
Catch Throwables when dumping recipes. Fixes #306.
2016-01-25 10:34:48 +02:00
Alex Bramley 06a849ad79 Add 'else' block to ensure all exceptions are logged. 2016-01-25 08:13:42 +00:00
Alex Bramley c49c3ce4da Catch Throwables when dumping recipes. 2016-01-24 20:45:37 +00:00
Jared d1eecc5d45 Update to 1.8.9, renamed jar, added Rcon support 2016-01-22 17:39:47 +02:00
Jared d3b5a8f958 Added better JEI support, updated to 1.8.9 2016-01-11 12:59:47 +02:00
Jared e61f1977ad Merge pull request #6 from stanhebben/master
Update from main
2016-01-11 12:52:30 +02:00
Stan Hebben 1dc4380a41 Merge pull request #285 from skydark/fix-zenscripts
Yet another "Yet another 'Several bug fixes and enhancements on ZenScripts'"
2016-01-11 07:30:15 +01:00
Jared 96aabeda12 Rename to CraftTweaker 2015-12-28 02:11:28 +02:00
Jared 821c35a026 Merge remote-tracking branch 'origin/master' 2015-12-25 03:51:19 +02:00
Jared ca57528306 Update to 1.8.8 added JEI support 2015-12-25 03:35:50 +02:00
jaredlll08 11cce15091 Merge remote-tracking branch 'refs/remotes/stanhebben/master' 2015-12-08 14:42:25 +02:00
Skydark Chen c35e3b1f78 Squashed commit of the following:
commit 0a3f5772b9450672fb033a6306fbf7fb0d972d5c
Author: Skydark Chen <[email protected]>
Date:   Fri Nov 27 10:54:46 2015 +0800

    Fix for-each iterator
    It should not pop from stack at the end while compiling.

commit 07c057e7502eb51ab3e6088eb2aee9ceb7d07576
Author: Skydark Chen <[email protected]>
Date:   Tue Nov 24 11:45:07 2015 +0800

    Fix non-int type arithmetic compare
    It was an error if we compare two double/float/long in scripts
    since the bytecode compiled in ExpressionArithmeticCompare.java were
    ICMPEQ/ICMPNE/... which assumed that two expressions had an int type.

commit 941b32c8be
Author: Skydark Chen <[email protected]>
Date:   Sun Nov 15 21:24:25 2015 +0800

    Fix ZenGetter and ZenSetter annotations
    Before this commit, ZenGetter and ZenSetter in ZenExpansion could not
    be defined. Since ZenExpansion requires static methods to work, but
    the getters and setters will be invoked as virtual.

commit bd55380b5a
Author: Skydark Chen <[email protected]>
Date:   Sun Nov 15 19:58:21 2015 +0800

    Fix block comments regexp

    Before this commit, comments like this could not be recognized:

        /* blah blah * blah  / <- this slash failed */

commit 2924666ad4
Author: Skydark Chen <[email protected]>
Date:   Sun Nov 15 19:44:02 2015 +0800

    Add support to return void in a function

    * statement `return;` is valid now.
    * functions return void by default, an explicit return is not necessary now

commit 33c2bd0c94
Author: Skydark Chen <[email protected]>
Date:   Sat Nov 14 13:48:53 2015 +0800

    Add unicode support for zenscripts

    The unicode characters can be recognized in strings and comments.
    The encoding of scripts should be utf-8.

commit 89b2548d02
Author: Skydark Chen <[email protected]>
Date:   Thu Nov 12 23:39:25 2015 +0800

    Fix nested foreach loop cause out of index
2015-11-30 19:15:25 +08:00
Stan Hebben 31375828c2 Merge pull request #283 from stanhebben/revert-279-fix-ZenGetterSetter
Revert "Several bug fixes and enhancements on ZenScripts"
2015-11-30 10:32:44 +01:00
Stan Hebben 89f22013f1 Revert "Several bug fixes and enhancements on ZenScripts" 2015-11-30 10:32:26 +01:00
Stan Hebben ad9c98a838 Merge pull request #279 from skydark/fix-ZenGetterSetter
Several bug fixes and enhancements on ZenScripts
2015-11-30 10:25:38 +01:00
Skydark Chen 941b32c8be Fix ZenGetter and ZenSetter annotations
Before this commit, ZenGetter and ZenSetter in ZenExpansion could not
be defined. Since ZenExpansion requires static methods to work, but
the getters and setters will be invoked as virtual.
2015-11-15 21:24:25 +08:00
Skydark Chen bd55380b5a Fix block comments regexp
Before this commit, comments like this could not be recognized:

    /* blah blah * blah  / <- this slash failed */
2015-11-15 19:58:21 +08:00
Skydark Chen 2924666ad4 Add support to return void in a function
* statement `return;` is valid now.
* functions return void by default, an explicit return is not necessary now
2015-11-15 19:44:02 +08:00
Skydark Chen 33c2bd0c94 Add unicode support for zenscripts
The unicode characters can be recognized in strings and comments.
The encoding of scripts should be utf-8.
2015-11-15 17:22:47 +08:00
Skydark Chen 89b2548d02 Fix nested foreach loop cause out of index 2015-11-12 23:39:25 +08:00
Jared b927b3b836 Fix Crop package problem 2015-10-06 09:58:05 +02:00
jaredlll08 81a7795edd update gitignore 2015-10-01 20:37:38 +02:00
jaredlll08 689d98024d Merge remote-tracking branch 'stanhebben/master' 2015-10-01 20:29:41 +02:00
Stan Hebben 28a8e50539 Duplicated the 1.7.10 changes to 1.8. 2015-09-21 08:20:45 +02:00
Jared ab09d13f9a Merge pull request #246 from jaredlll08/master
Add max damage action
2015-09-21 01:16:53 +02:00
jaredlll08 9bb25aee66 Update forge, add max damage 2015-09-21 00:30:16 +02:00
jaredlll08 0bb0dfb16a Merge remote-tracking branch 'stanhebben/master' 2015-09-20 23:48:44 +02:00
Jared dcef60e2d9 Merge pull request #243 from mrammy/master
Fixes and things.
2015-09-20 23:42:06 +02:00
Mary 397858834d Fix for https://github.com/stanhebben/MineTweaker3/issues/237 and makes sure that the fix for https://github.com/stanhebben/MineTweaker3/issues/194 works. 2015-09-18 15:28:53 -07:00
jaredlll08 83c5e43b53 Merge remote-tracking branch 'stanhebben/master' 2015-09-08 14:08:36 +02:00
Stan Hebben 34a2469cfc Added onPostReload event. Closes #223. 2015-09-06 08:53:04 +02:00
Stan Hebben 4b8af78057 - IC2 integration will now try to override recipes, if it can.
- Fixed a couple tiny things
2015-09-06 08:48:25 +02:00
jaredlll08 d0a66598ca Fix gitignore
files in /bin/ should not be included
2015-09-05 22:03:31 +02:00
jaredlll08 ee7f4542ed Merge remote-tracking branch 'stanhebben/master' 2015-09-05 21:59:41 +02:00
Stan Hebben 132fe38342 Fixed some test code slipping in. 2015-09-05 20:48:04 +02:00
Stan Hebben 5877b890f0 Merge branch 'master' of https://github.com/stanhebben/MineTweaker3 2015-09-05 20:42:43 +02:00
Stan Hebben aac2f5be26 Another thingy... 2015-09-05 20:42:35 +02:00
Stan Hebben 101b0b3331 - Fixed gitignore (again!) ~ gitignore magic!
- Removed redundant wrapper
2015-09-05 20:37:22 +02:00
Jared 1af6f2eaf9 Merge pull request #233 from jaredlll08/master
Master
2015-09-05 20:09:32 +02:00