 boni
|
9ea7a0e60f
|
Merge pull request #1841 from Nincraft/master
Refactor pattern costs to allow being overridden
|
2015-12-23 21:11:21 +01:00 |
|
|
boni
|
8cfaa53e0b
|
Merge pull request #1829 from Cronosus/patch-3
Update cs_CZ.lang
|
2015-12-06 17:25:46 +01:00 |
|
|
boni
|
6099173fc3
|
Update version
|
2015-10-27 19:38:23 +01:00 |
|
|
boni
|
ed02e551d7
|
Merge pull request #1773 from Mazdallier/patch-1
Update fr_FR.lang
|
2015-10-27 19:18:23 +01:00 |
|
|
boni
|
ea5a458190
|
Update readme to include license of rework
|
2015-09-30 17:29:29 +02:00 |
|
|
boni
|
ac202c3a17
|
Merge pull request #1758 from Mazdallier/patch-1
Create fr_FR.lang
|
2015-09-24 17:57:16 +02:00 |
|
|
boni
|
3d6b322302
|
Merge pull request #1746 from ReneMuetti/patch-1
Update de_DE.lang
|
2015-09-24 12:13:54 +02:00 |
|
|
boni
|
cc0c9a9a2e
|
Merge pull request #1747 from TheTemportalist/patch-1
Update ArmorControls.java
|
2015-09-23 09:47:00 +02:00 |
|
|
boni
|
12109a1cc1
|
Update build.properties
|
2015-08-17 12:25:36 +02:00 |
|
|
boni
|
84bb51d365
|
Merge pull request #1723 from Vexatos/patch-1
Fix a crash with dynamically generated tool parts (bolts) trying to get a material name shorter than 9 characters.
|
2015-08-10 20:52:18 +02:00 |
|
|
boni
|
ad04566799
|
Merge pull request #1690 from way2muchnoise/master
fixes #1468
|
2015-08-07 21:12:08 +02:00 |
|
|
boni
|
7eb99eb5f1
|
Merge pull request #1716 from mraof/master
Use the Item provided to addSmelteryMelting
|
2015-08-07 21:11:19 +02:00 |
|
|
boni
|
73e63af7de
|
Merge pull request #1715 from CandiceJoy/master
Fixed ArrayIndexOutOfBoundsException on DiamondApple getUnlocalizedName()
|
2015-08-02 21:22:53 +02:00 |
|
|
boni
|
95bb4556a5
|
Merge pull request #1692 from Adaptivity/master
Ore dict everything
|
2015-07-11 11:40:21 +02:00 |
|
|
boni
|
4b4ad1d86a
|
Bump version to 1.8.6a for alpha
|
2015-07-06 11:29:01 +02:00 |
|
|
boni
|
b3004ef383
|
Merge pull request #1609 from tahg/patch-1
Update ArmorProxyClient.java
|
2015-07-02 11:58:51 +02:00 |
|
|
boni
|
f0752fe33c
|
Merge pull request #1649 from LexManos/SmelteryFix
Fix potential bounds exception in Smeltery.
|
2015-07-02 11:58:28 +02:00 |
|
|
boni
|
3ea249c469
|
Merge pull request #1677 from Adaptivity/patch-1
Update ru_RU.lang
|
2015-06-28 17:44:32 +02:00 |
|
|
boni
|
9ea5607c11
|
Merge pull request #1673 from TherminatorX/master
New bricks
|
2015-06-28 11:00:51 +02:00 |
|
|
boni
|
6a4af4fbc0
|
Merge pull request #1674 from ganymedes01/patch-1
Added OreDictionary for a couple recipes
|
2015-06-26 08:56:11 +02:00 |
|
|
boni
|
6fc77df67d
|
Merge pull request #1644 from LemonLake/master
Proper English localisation
|
2015-06-24 23:51:26 +02:00 |
|
|
boni
|
2708f75692
|
Merge pull request #1661 from auxiliary-character/master
Fix possible Lumber Axe Crash
|
2015-06-20 14:39:39 +02:00 |
|
|
boni
|
a7405a3d10
|
Update README.md
|
2015-05-28 19:14:44 +02:00 |
|
|
boni
|
daa64c36b7
|
Merge pull request #1613 from Adaptivity/master
Remove TF material strings
|
2015-05-09 20:32:28 +02:00 |
|
|
boni
|
b5ffc4229e
|
Merge pull request #1592 from covers1624/master
Enhancement #1516: Glass panes lay down on the casting table.
|
2015-05-02 10:56:39 +02:00 |
|
|
boni
|
ec6a9f877f
|
Merge pull request #1585 from covers1624/master
Fix for #1552
|
2015-05-01 20:03:01 +02:00 |
|
|
boni
|
eb149eb094
|
Merge pull request #1577 from SamRaven2/CollisionFix
Right Click Placement Fix
|
2015-05-01 09:46:10 +02:00 |
|
|
boni
|
663be2d264
|
Merge pull request #1584 from covers1624/master
Fixes #1561
|
2015-04-30 13:56:28 +02:00 |
|
|
boni
|
4f78717bb6
|
Merge pull request #1558 from Mrkwtkr/patch-2
Update zh_CN.lang
|
2015-04-22 16:43:12 +02:00 |
|
|
boni
|
370dd27106
|
Merge pull request #1557 from TheVikingWarrior/patch-8
Update it_IT.lang
|
2015-04-20 23:00:29 +02:00 |
|
|
boni
|
2501749509
|
Merge pull request #1529 from shadowfacts/patch-1
Remove unnecessary/unused int
|
2015-04-13 10:43:47 +02:00 |
|
|
boni
|
20e3d08230
|
Merge pull request #1506 from micdoodle8/master
Fix tab position when effects are being displayed.
|
2015-04-02 19:31:18 +02:00 |
|
|
boni
|
c89e0237c5
|
Merge pull request #1470 from TheVikingWarrior/patch-7
Update it_IT.lang
|
2015-03-15 09:29:09 +01:00 |
|
|
boni
|
d85960f5ec
|
Merge pull request #1456 from nark31/master
Update ko_KR.lang
|
2015-03-09 15:51:51 +01:00 |
|
|
boni
|
04cbccf12f
|
Merge pull request #1426 from Adaptivity/master
Some improvements 2.0
|
2015-02-24 16:27:31 +01:00 |
|
|
boni
|
d0583f8150
|
Merge pull request #1413 from MrKunji/patch-4
Update pt_BR.lang
|
2015-02-22 16:29:07 +01:00 |
|
|
boni
|
0061b34834
|
Merge pull request #1410 from skyboy/patch-1
Fix created projectile offset
|
2015-02-21 21:34:10 +01:00 |
|
|
boni
|
71cdfffa68
|
Merge pull request #1408 from AnimadorX/patch-1
Create pt_PT.lang
|
2015-02-18 22:13:19 +01:00 |
|
|
boni
|
0405834bbc
|
Merge pull request #1394 from Adaptivity/patch-1
Update ru_RU.lang
|
2015-02-10 11:18:14 +01:00 |
|
|
boni
|
98bdd8e6a5
|
Merge pull request #1341 from al-myr/patch-3
Update pt_BR.lang
|
2015-01-16 15:14:54 +01:00 |
|
|
boni
|
d17ca72edd
|
Merge pull request #1343 from Adaptivity/mcmodfix
Fixed authorList
|
2015-01-14 17:08:17 +01:00 |
|
|
boni
|
5fa39da5be
|
Merge pull request #1340 from BigXplosion/IMCFluxBattery
Added IMC message for registering IEnergyContainerItems as a valid Flux modifier
|
2015-01-13 20:52:51 +01:00 |
|
|
boni
|
70eb4f7167
|
Merge pull request #1336 from Adaptivity/derpfix
Fixed small derp
|
2015-01-13 16:09:48 +01:00 |
|
|
boni
|
8db8f86da5
|
Merge pull request #1335 from al-myr/patch-2
Update pt_BR.lang
|
2015-01-13 16:09:35 +01:00 |
|
|
boni
|
7e8e5e2d66
|
Merge pull request #1333 from ganymedes01/patch-1
Use FluidStack sensitive version of getLocalizedName.
|
2015-01-13 13:17:37 +01:00 |
|
|
boni
|
e61bbd96ca
|
Merge pull request #1330 from Adaptivity/Wailaloc
Localize Waila config
|
2015-01-12 18:19:05 +01:00 |
|
|
boni
|
1350da3cdd
|
Merge pull request #1329 from al-myr/patch-1
Create pt_BR.lang
|
2015-01-12 12:55:46 +01:00 |
|
|
boni
|
792bb31e2f
|
Merge pull request #1327 from libertyCrown/master
Create ja_JP.lang
|
2015-01-11 18:54:30 +01:00 |
|
|
boni
|
a30e00231b
|
Merge pull request #1318 from Glassmaker/patch-crossbow-animation
Fixes Crossbow custom animation textures
|
2015-01-07 13:35:27 +01:00 |
|
|
boni
|
59ddac9c6b
|
Merge pull request #1314 from Adaptivity/tooltipsformanuals
Added tooltips for manuals and fixed typo in cfg
|
2015-01-06 15:35:33 +01:00 |
|
|
boni
|
b65c2a74db
|
Merge pull request #1311 from Adaptivity/Localizemodifiers
Localization for modifiers
|
2015-01-05 20:07:07 +01:00 |
|
|
boni
|
3c9bad7895
|
Merge pull request #1300 from squeek502/patch-4
Fix x.5 attack damage material stats getting shown as Full Durability in NEI
|
2015-01-02 23:48:33 +01:00 |
|
|
boni
|
22e9f4928b
|
Merge pull request #1299 from Adaptivity/targetLock
Small change to target lock
|
2015-01-02 19:11:27 +01:00 |
|
|
boni
|
6351d5399a
|
Merge pull request #1298 from Adaptivity/Russianbooks
Russian localization for books
|
2015-01-02 15:12:31 +01:00 |
|
|
boni
|
51f8ce1617
|
Merge pull request #1297 from Adaptivity/Localizearmor
Localize armor tooltips
|
2015-01-02 13:56:14 +01:00 |
|
|
boni
|
f02f3a1670
|
Merge pull request #1283 from squeek502/fixes/arrow-shaft-name
Add CustomMaterial support to DynamicToolPart and add Arrow-Shaft localization
|
2015-01-01 21:20:20 +01:00 |
|
|
boni
|
6c6e94793d
|
Merge pull request #1280 from Adaptivity/TEsupportfix
Fixed missing TE names
|
2015-01-01 18:06:38 +01:00 |
|
|
boni
|
90ef930f4b
|
Merge pull request #1276 from squeek502/patch-2
Fix spaces being missing after some tool station GUI strings
|
2014-12-31 09:29:45 +01:00 |
|
|
boni
|
f6f22b5eea
|
Merge pull request #1273 from squeek502/patch-1
Fix unsafe getCompoundTag call in PotionLauncher.getItemUseAction
|
2014-12-30 09:25:17 +01:00 |
|
|
boni
|
2f4ea07f98
|
Merge pull request #1269 from Adaptivity/Update
Some fixes
|
2014-12-28 17:20:05 +01:00 |
|
|
boni
|
8560cb23e0
|
Merge pull request #1266 from asiekierka/stable
fix Tinkers Weaponry book spawning with beginner book option off
|
2014-12-28 00:43:55 +01:00 |
|
|
boni
|
2f2a929fab
|
Merge pull request #1264 from NatsuArashi/patch-1
Create zh_TW.lang
|
2014-12-26 20:06:03 +01:00 |
|
|
boni
|
b32b12d6e5
|
Merge pull request #1257 from Adaptivity/patch-3
Update ru_RU.lang
|
2014-12-24 09:21:18 +01:00 |
|
|
boni
|
3ccfc0a22a
|
Merge pull request #1247 from asiekierka/stable
Make TinkerSmeltery optional, make the beginner book option apply to the smeltery/tool station books as well
|
2014-12-21 21:17:20 +01:00 |
|
|
boni
|
d4d859b71b
|
Merge pull request #1203 from TheTemportalist/master
Fixed possible NPE
|
2014-12-04 16:14:05 +01:00 |
|
|
boni
|
b545fb530a
|
Merge pull request #1212 from TheVikingWarrior/patch-6
Update it_IT.lang
|
2014-12-03 21:31:40 +01:00 |
|
|
boni
|
d15c6a5f98
|
Merge pull request #1167 from Slind14/master
avoid fake player crash
|
2014-11-15 19:07:01 +01:00 |
|
|
boni
|
8ba9eea615
|
Merge pull request #1161 from TheTemportalist/master
Fix NEK integration without NEK
|
2014-11-14 01:18:00 +01:00 |
|
|
boni
|
67f786e20b
|
Merge pull request #1158 from TheTemportalist/master
Fix NEK integration
|
2014-11-11 23:58:13 +01:00 |
|
|
boni
|
cc8695ed92
|
Merge pull request #1157 from TheTemportalist/master
More fixes?
|
2014-11-11 23:24:12 +01:00 |
|
|
boni
|
8c3e78d4a2
|
Merge pull request #1156 from TheTemportalist/master
I forgot to register with NEK
|
2014-11-11 22:18:49 +01:00 |
|
|
boni
|
ec2311ec87
|
Merge pull request #1155 from TheTemportalist/master
This should be valid for NEK integration.
|
2014-11-11 22:00:41 +01:00 |
|
|
boni
|
49b8787fdf
|
Merge pull request #1143 from puyo061/patch-3
Update Korean translation
|
2014-11-04 10:05:21 +01:00 |
|
|
boni
|
ff69b98afe
|
Merge pull request #1140 from Mrkwtkr/patch-2
Update zh_CN.lang
|
2014-11-03 09:48:48 +01:00 |
|
|
boni
|
c58bec5c78
|
Merge pull request #1131 from Mrkwtkr/patch-2
Update zh_CN.lang
|
2014-10-28 15:43:22 +01:00 |
|
|
boni
|
ae3eae19e4
|
Merge pull request #1122 from TheVikingWarrior/patch-3
Update it_IT.lang
|
2014-10-26 09:19:37 +01:00 |
|
|
boni
|
f5d1e0a710
|
Merge pull request #1120 from Mrkwtkr/patch-2
Translation of manuals
|
2014-10-25 19:33:42 +02:00 |
|
|
boni
|
506731d618
|
Merge pull request #1115 from puyo061/patch-2
Update Korean translation
|
2014-10-25 18:53:37 +02:00 |
|
|
boni
|
20e295123c
|
Merge pull request #1100 from crafteverywhere/master
Make the manuals translatable.
|
2014-10-25 18:53:12 +02:00 |
|
|
boni
|
735360f2c6
|
Merge pull request #1116 from Adaptivity/patch-2
Update ru_RU.lang
|
2014-10-25 09:31:21 +02:00 |
|
|
boni
|
ed9615a93d
|
Merge pull request #1114 from MikeLydeamore/master
Added /dev/null block placing functionality
|
2014-10-25 09:30:50 +02:00 |
|
|
boni
|
78167ba7ac
|
Merge pull request #1117 from TheVikingWarrior/patch-5
Tool Station is localized
|
2014-10-23 23:01:50 +02:00 |
|
|
boni
|
067f78ccef
|
Merge pull request #1111 from TheVikingWarrior/patch-2
More nei localization
|
2014-10-22 23:04:06 +02:00 |
|
|
boni
|
fdc3fc09df
|
Merge pull request #1110 from TheVikingWarrior/patch-4
Nei localized
|
2014-10-22 22:22:28 +02:00 |
|
|
boni
|
80808e64ed
|
Merge pull request #1109 from TheVikingWarrior/patch-2
The return of waila localization
|
2014-10-22 21:33:56 +02:00 |
|
|
boni
|
43550d8224
|
Merge pull request #1105 from TheVikingWarrior/patch-18
Update it_IT.lang
|
2014-10-20 20:12:25 +02:00 |
|
|
boni
|
c20d91d3a1
|
Merge pull request #1095 from OndraSter/master
Fix NPE for some (at least Mekanism) pipes
|
2014-10-18 16:52:47 +02:00 |
|
|
boni
|
6fed4c3455
|
Merge pull request #1094 from puyo061/patch-1
Update ko_KR.lang
|
2014-10-18 16:52:38 +02:00 |
|
|
boni
|
69c75b9fde
|
Merge pull request #1092 from Adaptivity/patch-2
Update ru_RU.lang
|
2014-10-16 11:38:28 +02:00 |
|
|
boni
|
680aa3c578
|
Merge pull request #1065 from MCGamer20000/master
Added hardcore mode additional hearts
|
2014-10-07 19:17:40 +02:00 |
|
|
boni
|
bd498aacb5
|
Merge pull request #1063 from Qowyn/nei-and-knapsack
New NEI feature and knapsack fix
|
2014-10-05 22:37:46 +02:00 |
|
|
boni
|
093a712fdb
|
Merge pull request #1054 from Tonius/master
Fixed tool rendering breaking scoreboard and player list rendering
|
2014-10-05 17:33:45 +02:00 |
|
|
boni
|
abce715f60
|
Merge pull request #1050 from Mrkwtkr/patch-2
Update zh_CN.lang
|
2014-10-04 17:00:28 +02:00 |
|
|
boni
|
ae8d191ea8
|
Merge pull request #1045 from Qowyn/arrows-and-gui-fixes
Arrows and gui fixes
|
2014-10-04 17:00:21 +02:00 |
|
|
boni
|
901a3e3be9
|
Merge pull request #1041 from TheVikingWarrior/patch-17
Update it_IT.lang
|
2014-09-29 19:57:07 +02:00 |
|
|
boni
|
9d80633b60
|
Merge pull request #1034 from Qowyn/actcont-fix
Restore ActiveContainer behavior. Fixes #1033
|
2014-09-28 17:40:18 +02:00 |
|
|
boni
|
e1fa1e6808
|
Merge pull request #1030 from Adaptivity/patch-2
Fixed gamebreaking bug №2
|
2014-09-26 21:26:56 +02:00 |
|
|
boni
|
8d45b4411f
|
Merge pull request #1029 from Qowyn/derp-fix-2
Another fix. For the thing which should be fixed already.
|
2014-09-25 23:11:35 +02:00 |
|
|
boni
|
34a2ad7f3a
|
Merge pull request #1028 from Qowyn/derp-fix
underp CraftingStationGui with chest(s) attached
|
2014-09-25 15:58:24 +02:00 |
|
|
boni
|
2925e96d6c
|
Merge pull request #1023 from Tonius/master
Added an NEI handler for tool material stats
|
2014-09-24 18:47:05 +02:00 |
|