Commit Graph
389 Commits
Author SHA1 Message Date
mDiyo 856b31361d Fix merge conflicts 2013-09-08 20:37:41 -07:00
mDiyo 83c9127ba1 Add Jerky, fix Drying Rack 2013-09-08 19:23:22 -07:00
Sunstrike 07856db689 Make MFR compat a child mod to reduce mod list clutter. 2013-09-09 01:58:50 +01:00
Sunstrike fc56cea508 Remove extraneous mcmod.info 2013-09-09 01:58:48 +01:00
Zach 19eee410d7 Merge pull request #165 from progwml6/master
adding prog and sun to capes usiing fuj1n's tc logo cape
2013-09-08 17:51:49 -07:00
Progwml6 44afbcd654 adding prog and sun to capes usiing fuj1n's tc logo cape 2013-09-08 20:50:36 -04:00
Zach e1f4fe8f73 Merge pull request #164 from progwml6/master
updating both mcmod.info files for consistency, and to reflect expanded ...
2013-09-08 17:35:06 -07:00
Sunstrike 439cb0462b Change git tag format in Ant (no more 1.4.dev... stuff) 2013-09-09 01:34:25 +01:00
Progwml6 0cdc722099 updating both mcmod.info files for consistency, and to reflect expanded dev team 2013-09-08 20:31:55 -04:00
mDiyo ad83893e9f Merge pull request #162 from Sunstrike/fc-npe
Fix fake player NPE (as found by Soaryn)
2013-09-08 17:05:54 -07:00
mDiyo ed6946d712 Merge pull request #163 from progwml6/master
adding BOP api with Amnet's permission in order to allow for adding TiC ...
2013-09-08 17:05:45 -07:00
Sunstrike 802fb3a15b Fix fake player NPE (as found by Soaryn) 2013-09-08 23:09:32 +01:00
Progwml6 c41d9f70fa adding BOP api with Amnet's permission in order to allow for adding TiC compatibility 2013-09-08 16:56:43 -04:00
Arthur Uzulin 0b4ab68341 Replaced Init with EventHandler in MFRCompat 2013-09-08 19:03:58 +10:00
Arthur Uzulin c3ebcf44b3 Fixed hoppers extracting the frypan
Fixed hoppers being able to extract the frying pan making it (hopefully)
impossible to extract/place items into the invisible frying pan slot of
the placed frying pan.
2013-09-08 18:51:19 +10:00
fuj1n 6ed986c3e1 Update README.md 2013-09-08 16:20:26 +10:00
fuj1n ea1d2f8494 Update README.md 2013-09-08 16:20:11 +10:00
fuj1n 8be2193142 Update README.md 2013-09-08 16:19:21 +10:00
mDiyo 3fc5392f6a Merge pull request #159 from progwml6/master
remove MC version from readme
2013-09-07 13:38:58 -07:00
Progwml6 1180f60b0f remove MC version from readme 2013-09-07 16:37:13 -04:00
mDiyo d8ca94b5ec Merge pull request #158 from progwml6/master
modify readme.md to reflect new build system along with issue reporting ...
2013-09-07 13:31:09 -07:00
Progwml6 8ccb0dff1b modify readme.md to reflect new build system along with issue reporting requirements 2013-09-07 16:28:19 -04:00
mDiyo 19cf7275f2 Merge pull request #155 from invinctus/master
Implemented IFluidHandler on Smeltery Drain
2013-09-07 13:11:40 -07:00
mDiyo 931b1e7acb Merge pull request #142 from tycho/master
A couple fixes
2013-09-07 13:04:46 -07:00
fuj1n 81c0ff7720 Merge pull request #157 from progwml6/master
Updated MCP mappings, and corresponding necessary build.xml changes for newest forge
2013-09-07 04:52:52 -07:00
Sunstrike f5de941b2e Fix broken slimes (that sounds weird...) 2013-09-07 12:22:20 +01:00
Progwml6 de50db7165 Update build.xml (Ant) for newer Forge. Adjust MCP mappings as needed. 2013-09-07 12:21:55 +01:00
Arthur Uzulin 456adb947b Fixed that one annoying pixel in every clear...
...glass texture
2013-09-07 14:52:18 +10:00
invinctus 5c78255556 Implemented IFluidHandler on Smeltery Drain 2013-09-06 12:34:46 +01:00
mDiyo 71ba72abab Knapsacks drop items in the proper spot 2013-09-05 12:59:58 -07:00
mDiyo 56c1cec850 Add Slime Channels, Bounce Pads, Reorganize landmine packages 2013-09-05 12:39:18 -07:00
mDiyo ce6605314a Re-add essence extractor block 2013-09-04 20:26:43 -07:00
Steven Noonan 700d9a2dff LavaTankItemBlock: translate FluidName when rendering tooltip
Without this, it would render with the untranslated string (e.g. "Contains
electrum.molten" or similar).

Signed-off-by: Steven Noonan <[email protected]>
2013-09-04 19:22:59 -07:00
Steven Noonan 7a9dbd703c SmelteryLogic: don't crash when melting Endermen with a Smeltery
A FluidStack was being incorrectly constructed, causing the game to bomb out
when ender fluid was added to the Smeltery.

Signed-off-by: Steven Noonan <[email protected]>
2013-09-04 19:22:59 -07:00
mDiyo 1229c80ba6 Update version number 2013-09-04 19:22:51 -07:00
mDiyo 0ae48431b3 Remove Light Aggregator 2013-09-04 19:21:57 -07:00
fuj1n 0e043af58d Update capes.txt 2013-09-04 19:44:40 +10:00
mDiyo 30a30e1284 Update capes.txt 2013-09-03 07:24:26 -07:00
mDiyo 43e044ae96 Merge pull request #150 from Zerokyuuni/master
Oink
2013-09-03 05:21:07 -07:00
Zerokyuuni 0a1376fe07 Oink
Oink Oink SQUEEL... ALLOY!
2013-09-03 08:09:48 -04:00
Arthur Uzulin 63614e4db4 Fixed the essence crystal being initialized twice 2013-09-03 19:56:33 +10:00
mDiyo e7a48cf2f4 Update capes.txt 2013-09-02 07:07:00 -07:00
mDiyo cca9f90be4 Update capes.txt 2013-09-02 06:47:17 -07:00
Arthur Uzulin f66ec7bb91 Fixed #54 for casting basins 2013-09-02 22:55:53 +10:00
Arthur Uzulin 5cb0aa6776 Fixed #54 2013-09-02 22:38:06 +10:00
Arthur Uzulin a08e374249 Fixed #131 2013-09-02 22:25:42 +10:00
Arthur Uzulin 0acef0e990 Moved Polish translation to the new lang location 2013-09-02 16:40:53 +10:00
fuj1n b05bf01e69 Merge pull request #145 from UnekPL/master 2013-09-01 23:21:09 -07:00
fuj1n 024970c16e Merge pull request #144 from Sunstrike/restructure
Create Ant build system for CI automation
2013-09-01 23:16:43 -07:00
UnekPL cd3e5eb24d added pl_PL.xml 2013-09-01 21:39:37 +02:00