Commit Graph
126 Commits
Author SHA1 Message Date
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
jaredlll08 eee6b49242 Merge remote-tracking branch 'stanhebben/master' 2015-09-05 20:06:06 +02:00
jaredlll08 7a40b45a82 Fix Blocks 2015-09-05 20:03:15 +02:00
Stan Hebben 48dd85aa13 Fixed the oredict operations in 1.8 2015-09-05 19:41:56 +02:00
Jared be207cc3ca Merge pull request #3 from stanhebben/master
sync
2015-09-05 18:34:16 +02:00
Stan Hebben 3e33904edd - Fixed right-clicking mid-air crashing the client
- Fixed bracket handlers not working
- Improved implementation of rebuilding internal item registry at server start
2015-09-05 18:18:38 +02:00
Stan Hebben ad7b02c1ed Merge branch 'master' of https://github.com/stanhebben/MineTweaker3 2015-09-05 17:47:44 +02:00
Stan Hebben bf59a41c4e Removed examplemod. 2015-09-05 17:47:36 +02:00
Jared 2781ab7deb Merge pull request #232 from jaredlll08/Dev
Tests for 1.8
2015-09-05 17:46:46 +02:00
jaredlll08 2c4299c33c Tests for 1.8 2015-09-05 17:35:18 +02:00
Stan Hebben c1d631521a Fixed a couple lines in the gitignore. 2015-09-05 17:29:13 +02:00
Stan Hebben 52d67f4957 Improving gitignore. 2015-09-05 17:26:22 +02:00
Stan Hebben 020f68b471 Merge branch 'master' of https://github.com/stanhebben/MineTweaker3
Conflicts:
	MineTweaker3-MC18-Main/build.gradle
	MineTweaker3-MC18-Main/src/main/resources/mcmod.info
2015-09-05 16:56:54 +02:00
Stan Hebben 32af3a26d0 Merge pull request #231 from jaredlll08/master
1.8
2015-09-05 16:55:55 +02:00
Stan Hebben 433b977c64 - Removed 1.6.4
- Removed 1.7.2
- Removed GregTech integration (superseded by the GT addon by DreamMasterXXL)
- Setup gradle for 1.8
2015-09-05 16:54:32 +02:00
jaredlll08 b2b13776f1 1.8 2015-09-05 16:51:51 +02:00
Jared 5b7151c14e Merge pull request #230 from Yulife/patch-1
@jaredlll08 you should check over your changes :)
2015-09-05 16:11:26 +02:00
Yulife b2751d25d4 @jaredlll08 you should check over your changes :) 2015-09-05 16:09:54 +02:00
Jared 5eef72bf61 Merge pull request #2 from stanhebben/master
sync
2015-09-05 16:07:25 +02:00
Jared 5ab22f48ed Merge pull request #229 from jaredlll08/master
Fix MFR Fertilzer
2015-09-05 15:55:11 +02:00
jaredlll08 fa5de406c7 fix comment out 2015-09-05 15:52:20 +02:00
jaredlll08 13338bc15d Made fertilizer static 2015-09-05 15:51:48 +02:00
Stan Hebben e56f88e635 Merge pull request #227 from jaredlll08/master
Closes a bunch of issues (including #160), added block hardness.
2015-09-05 15:08:26 +02:00
jaredlll08 cfca8a7e5f update MFR caller 2015-09-04 22:57:49 +02:00
jaredlll08 581f72170c Clsoe #194 2015-09-04 16:20:50 +02:00
jaredlll08 fb2bfd14c1 update readme to show the correct file. 2015-09-04 14:46:45 +02:00
jaredlll08 80f6e002b6 Remove 1.8 src, update forge 2015-09-04 13:26:28 +02:00
jaredlll08 9169a35cb6 close #105 2015-09-04 01:19:47 +02:00
jaredlll08 88d2793b00 close #119 2015-09-04 00:57:06 +02:00
jaredlll08 f08bd00ef7 Close #163
Problem was, no one was on the server, therefore the UserListOPs is null
2015-09-03 23:45:11 +02:00
Jared fcba0b1039 Merge pull request #1 from stanhebben/master
Merge pull request #226 from jaredlll08/master
2015-09-03 23:06:53 +02:00
jaredlll08 eccf4d28c2 block hardness 2015-09-03 10:41:47 +02:00
Jared 8d7620c92e Merge pull request #226 from jaredlll08/master
Fixed some issues, added some stuff
2015-08-31 19:34:29 +02:00
jaredlll08 b36c6dade6 format all the things! 2015-08-31 19:15:35 +02:00
jaredlll08 54ec75fd3d close #74 close #133 2015-08-31 19:08:46 +02:00