Commit Graph
186 Commits
Author SHA1 Message Date
Jared ee7fe8d297 Testing for #20 2016-05-08 22:31:02 +02:00
Jared ee12d42b6e Removed buildcraft 2016-05-08 22:17:36 +02:00
Jared 6a7fe6976f Added build.gradle 2016-05-08 22:08:48 +02:00
Jared 627053fa06 readded the old mods 2016-05-08 20:07:16 +02:00
Jared d915201429 Added setupCIWorkspaceAll 2016-05-08 16:20:19 +02:00
Jared 19bd628051 Updated forge versions 2016-05-08 16:17:51 +02:00
Jared 553e13a878 Fixed event handler 2016-05-08 16:04:53 +02:00
Jared 1325f8b6c1 JEI is better now 2016-05-05 15:20:01 +02:00
Jared 5ce51286bb 1.8 JEI is back 2016-05-05 14:46:01 +02:00
Jared a555813ed9 1.8 is back 2016-05-05 14:18:48 +02:00
Jared 7a817d26be Fix package for 1.7 2016-05-05 01:51:09 +02:00
Jared 2c24f3f77a Added a few checks 2016-05-05 01:30:36 +02:00
Jared ab1eb5cff5 Close 341 from master repo 2016-05-04 21:49:01 +02:00
Jared bdba3c5584 close #15 2016-05-04 21:26:21 +02:00
Jared 9815d74980 Remove debug code 2016-05-04 20:42:19 +02:00
Jared 566e0fd9f1 Closed #11
Very hacky, but it works
2016-05-04 20:37:26 +02:00
Jared 43f9dba1a1 Note to future self: Uncomplicate the gitignore 2016-04-27 03:27:54 +02:00
Jared 873bff3a11 MC19 2016-04-26 00:06:14 +02:00
Jared 53cfa6348e Close #13
apparently my system env wasn't et, only user env
2016-04-20 12:28:30 +02:00
Jared 262cf310e4 Close #14 2016-04-18 04:08:56 +02:00
Jared a426d8da79 1.7 Main is now only supported, no 1.8, yes 1.9
Close #9
2016-04-18 03:38:02 +02:00
Jared 9684971e44 added remove tag 2016-03-13 21:15:35 +02:00
Jared df6b587fc1 Merge pull request #12 from stanhebben/master
Updates strategy
2016-03-13 21:14:27 +02:00
Jared 1a082586a8 close #10 2016-02-29 22:52:27 +02:00
Jared bb355133af update gitignore 2016-02-27 17:12:57 +02:00
Jared dea355917d Merge pull request #8 from Techlone/master
OreDict features
2016-02-19 22:41:14 +02:00
Jared a6728529fb Update ItemExpansion.java 2016-02-19 09:32:47 +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