mDiyo
|
b4b74903b4
|
Make sure glueballs have textures
|
2013-11-24 23:25:53 -08:00 |
|
mDiyo
|
d9a316284e
|
Stencil table fix, glue ingots changed to balls and reregistered
|
2013-11-24 23:24:56 -08:00 |
|
Zach
|
e47db4f310
|
Merge pull request #351 from TheVikingWarrior/patch-1
Tooltips in italian :D
|
2013-11-24 11:20:40 -08:00 |
|
tmpillbox
|
e526159070
|
Cleanup PR merge mistakes
|
2013-11-24 13:12:40 -06:00 |
|
TheVikingWarrior
|
43124a4442
|
Tooltips in italian :D
|
2013-11-24 09:54:19 +01:00 |
|
mDiyo
|
728a49714d
|
Merge pull request #345 from TheVikingWarrior/patch-2
Update it_IT.lang
|
2013-11-23 23:17:38 -08:00 |
|
mDiyo
|
9ebcbe031d
|
Merge pull request #346 from TheVikingWarrior/patch-1
Localized Tooltips
|
2013-11-23 23:17:28 -08:00 |
|
mDiyo
|
d983c65958
|
Register Pigiron properly
|
2013-11-23 19:22:48 -08:00 |
|
mDiyo
|
090da30a5b
|
Disable armor casts better
|
2013-11-23 19:07:27 -08:00 |
|
mDiyo
|
c913b9cf3f
|
Fix merge conflicts
|
2013-11-23 18:34:10 -08:00 |
|
mDiyo
|
60ade29f01
|
Comment out armor casts, fix stencil table bug
|
2013-11-23 18:30:52 -08:00 |
|
Sunstrike
|
84e39568f6
|
Fix Glue IDs (Probably)
Don't have access to an IDE; another dev can correct it if *this* is wrong too.
|
2013-11-24 00:48:38 +00:00 |
|
Sunstrike
|
56438d5162
|
Merge pull request #349 from TheVikingWarrior/patch-3
Update it_IT.lang
|
2013-11-23 10:19:04 -08:00 |
|
TheVikingWarrior
|
2db60ea8a1
|
Update it_IT.lang
|
2013-11-23 19:15:56 +01:00 |
|
Sunstrike
|
1604aee9fc
|
Merge pull request #348 from VeryBigBro/patch-2
Update ru_RU.lang
|
2013-11-23 08:37:52 -08:00 |
|
Anton
|
a4838078f2
|
Update ru_RU.lang
And again
|
2013-11-23 19:35:48 +03:00 |
|
Sunstrike
|
5d4ed1842d
|
Update en_US.lang
Forgot a few localisations.
|
2013-11-23 16:26:38 +00:00 |
|
Sunstrike
|
48e0af4346
|
Merge pull request #347 from VeryBigBro/patch-1
Update ru_RU.lang
|
2013-11-23 08:24:27 -08:00 |
|
Sunstrike
|
0354ce09f1
|
Make horse melting configurable.
For the overzealous, the vegetarian and the squeemish. The setting is in Experimental.
|
2013-11-23 16:21:40 +00:00 |
|
Anton
|
900d1332c5
|
Update ru_RU.lang
|
2013-11-23 19:16:47 +03:00 |
|
Sunstrike
|
7a18a41e00
|
It kills horses? SHIP IT
|
2013-11-23 16:16:17 +00:00 |
|
Sunstrike
|
3837ecdb45
|
Glue ingots
|
2013-11-23 16:09:12 +00:00 |
|
Sunstrike
|
decbb7d01f
|
More gluey things.
Glue blocks can be melted in the smeltery, and casted into blocks with the basin. Buckets too.
|
2013-11-23 15:48:19 +00:00 |
|
Progwml6
|
14d357ccf6
|
manual merge of master branch changes up to commit 1387bc6
|
2013-11-23 09:31:19 -05:00 |
|
Sunstrike
|
1387bc6f74
|
Glue block
|
2013-11-23 14:09:08 +00:00 |
|
Sunstrike
|
2bf8dc759c
|
Manually merge because of Git derp
|
2013-11-23 12:58:14 +00:00 |
|
Sunstrike
|
b2580cec27
|
Make Anonymous classes less anonymous
This shuts up FML, and also means we'll survive a 1.7 upgrade. Maybe. Probably not. Worth a go.
|
2013-11-23 12:53:57 +00:00 |
|
Progwml6
|
2d99d5dba2
|
cleanup shop
|
2013-11-23 01:50:45 -05:00 |
|
Progwml6
|
3c0fc6c092
|
add in library jar, use classifier for the type of jar not appendix
|
2013-11-23 01:17:34 -05:00 |
|
Progwml6
|
24beb22fa1
|
add in version handling/ replacement inside mcmodinfo
|
2013-11-23 00:04:46 -05:00 |
|
Progwml6
|
707f7996b5
|
method doesnt need override anymore
|
2013-11-22 22:44:02 -05:00 |
|
mDiyo
|
26ce581662
|
Add a note to Environment Checks
|
2013-11-22 19:22:17 -08:00 |
|
mDiyo
|
3041f43223
|
Fix Smeltery causing massive updates
|
2013-11-22 13:46:43 -08:00 |
|
TheVikingWarrior
|
e0026c3539
|
tooltips
|
2013-11-22 15:25:49 +01:00 |
|
TheVikingWarrior
|
73b1a99714
|
Update HamboneItemBlock.java
|
2013-11-22 15:21:59 +01:00 |
|
TheVikingWarrior
|
87b6d1d5a6
|
Update MetalItemBlock.java
|
2013-11-22 15:21:19 +01:00 |
|
TheVikingWarrior
|
06c3b01dc8
|
Update PotionLauncher.java
|
2013-11-22 15:13:38 +01:00 |
|
TheVikingWarrior
|
10ffad653c
|
Update Pattern.java
|
2013-11-22 15:11:13 +01:00 |
|
TheVikingWarrior
|
658e389d62
|
Update BarricadeItem.java
|
2013-11-22 15:08:44 +01:00 |
|
TheVikingWarrior
|
5734d01456
|
Update OreberryBushSecondItem.java
|
2013-11-22 15:06:20 +01:00 |
|
TheVikingWarrior
|
08aa48231b
|
Update OreberryBushItem.java
|
2013-11-22 15:03:44 +01:00 |
|
TheVikingWarrior
|
dfdc1371ae
|
Update GoldenHead.java
|
2013-11-22 15:00:50 +01:00 |
|
TheVikingWarrior
|
e8e360fbf0
|
Update ItemBlockLandmine.java
|
2013-11-22 14:55:47 +01:00 |
|
TheVikingWarrior
|
2ce86385cb
|
Update HeartCanister.java
|
2013-11-22 14:44:54 +01:00 |
|
TheVikingWarrior
|
951506dbd5
|
Update OreBerries.java
|
2013-11-22 14:41:18 +01:00 |
|
TheVikingWarrior
|
625fd55e3a
|
Update LavaTankItemBlock.java
|
2013-11-22 14:38:18 +01:00 |
|
TheVikingWarrior
|
809f2c51bb
|
Update Manual.java
|
2013-11-22 14:29:24 +01:00 |
|
TheVikingWarrior
|
d8f262b211
|
Update SpeedSlabItem.java
|
2013-11-22 14:24:58 +01:00 |
|
TheVikingWarrior
|
ba6a4b5219
|
Update SpeedBlockItem.java
|
2013-11-22 14:21:26 +01:00 |
|
TheVikingWarrior
|
bc157e36cc
|
Update SoilSlabItem.java
|
2013-11-22 14:16:07 +01:00 |
|