Commit Graph
107 Commits
Author SHA1 Message Date
Stan Hebben 48dd85aa13 Fixed the oredict operations in 1.8 2015-09-05 19:41:56 +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
jaredlll08 fd17ded261 Attempt to add maxStackSize 2015-08-31 15:34:17 +02:00
jaredlll08 c0dbda6874 Fix #83 2015-08-29 21:59:13 +02:00
jaredlll08 b5f17756f9 fix gitignore 2015-08-29 21:55:34 +02:00
Stan Hebben ef126ff7df Merge pull request #209 from bculkin2442/master
Mod integration update
2015-07-28 21:26:04 +02:00
Stan Hebben 87d8caa678 Committing missing file. 2015-07-28 21:18:43 +02:00
bculkin2442 c312bd8d2e Finished GT integration support update
* Added machines
  - Autoclave
  - Electro-Magnetic Seperator
  - Forming Press
  - Laser Engraver
  - Mixer
  - Printer
  - Pulveriser
  - Sifter
2015-07-27 19:04:31 -04:00
bculkin2442 2ae53918e4 More work remains to be done on GT support, but I'm going to bed for now
* Added machines
  - Chemical Bath
  - Fermenter
  - Fluid Canner
  - Fluid Smelter (or extractor. Both are the same)
2015-07-26 22:45:35 -04:00
bculkin2442 646c6abe89 Roughly half done with GT support update.
* Added new machines
  - Arc Furnace (Simple/Plasma)
  - Brewing Machine
  - Cutter
  - Distillery
  - Fluid Heater
  - Fluid Solidifier
  - Polarizer
  - Slicer
* Updated many other machines to take new kinds of recipes
2015-07-26 21:56:41 -04:00
bculkin2442 0e096b2c63 Added ability to convert arrays of ILiquidStack to FluidStack arrays 2015-07-26 21:00:38 -04:00
bculkin2442 ee6b5b9692 Started long process of updating GT Mod support.
Also, adds possibly missing MFR files.
2015-07-26 18:01:59 -04:00
bculkin2442 dd1e123cde Bumped MFR integration versions
* CoFHCore to 3.0.0B3-26
* ThermalFoundation to 1.0.0B1-6
* MFR to 2.8.0RC2-557
2015-07-26 17:25:01 -04:00
bculkin2442 7e5be4451f Added missing file for IC2 crop lookup 2015-07-26 17:04:28 -04:00
bculkin2442 ab6608368c Added ability to lookup registered IC2 Crops 2015-07-26 17:03:08 -04:00
bculkin2442 7d1e65dae6 Added *experimental and untested* support for creating custom IC2 crops 2015-07-26 12:14:29 -04:00
bculkin2442 5e3babe90a Update IC2 support to version 2.2.756
* Added support for recipes to
  * Blast Furnace
  * Block Cutter
* Added ability to specify fuels for Fluid Heat Generator
2015-07-25 20:28:41 -04:00
bculkin2442 85a8b09ea1 Fixed some misc. build errors. 2015-07-25 19:28:17 -04:00
Stan Hebben a014af8ba0 Merge branch 'master' of https://github.com/stanhebben/MineTweaker3 2015-06-27 08:27:42 +02:00
Stan Hebben 00bcf843e5 - Updated to new Forge version
- Added script locking
2015-06-27 08:26:38 +02:00
Stan Hebben 47f59a78a1 Merge pull request #145 from skaviouz/patch-1
Update Planter.java addPlantable IItemStack for block representation.
2015-02-05 22:27:48 +01:00