Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-05-04 10:05:15 +02:00
Code Issues Projects Releases Wiki Activity
2597 commits 13 branches 0 tags 32 MiB
Commit graph

2264 commits

Author SHA1 Message Date
Shadows_of_Fire 08d0e8b7fb Update mappings 2018-08-03 22:22:20 -04:00
Shadows_of_Fire 32716bfca9 Closes #1154 2018-07-27 21:40:36 -04:00
Shadows_of_Fire 7c7e87bea4 remove bad 2018-07-27 20:48:26 -04:00
Shadows_of_Fire 6c10642832 Closes #1152 2018-07-27 20:45:50 -04:00
Shadows_of_Fire f476e47a46 Closes #1150 2018-07-27 20:11:58 -04:00
Shadows_of_Fire 1bec4bbff7 Closes #1145 2018-07-27 20:08:42 -04:00
Shadows_of_Fire f59c431649 Fix up farmer behaviors 2018-07-27 20:05:33 -04:00
Rick 7a5b1dcd1c Update en_US.lang (#1107) 
I discovered that the application of the Storage Chest Upgrade requires a sneak-right-click rather than a shift-right-click.
Also, the Upgrade works on Quark chests, which are wooden, but not Iron Chests, which are non-wood. Wasn't sure if I described it very well, but I thought it was a start.
 2018-07-11 03:35:25 -04:00
Shadows_of_Fire a10999736a unregister the update checker after finishing 
since this is a tick handler keeping it registered is probably a bad
idea.
 2018-07-10 19:10:26 -04:00
Shadows_of_Fire 2584bb9cf4 Closes #1143 2018-07-09 23:40:41 -04:00
Shadows_of_Fire 8649106d22 am forgot 2018-07-08 04:31:26 -04:00
Shadows_of_Fire 71d5d52462 Closes #1142 2018-07-07 06:07:22 -04:00
Shadows_of_Fire 3df0738429 imporps 2018-07-07 05:38:33 -04:00
Shadows_of_Fire fb6cedbb71 remove legacy load 2018-07-07 05:35:39 -04:00
Shadows_of_Fire 61e3f2c9fe betr cod 2018-07-04 03:29:27 -04:00
Shadows_of_Fire bdd87c621c Closes #1137 2018-06-29 16:32:33 -04:00
Shadows_of_Fire 3953c8b3b2 Properly send these events 2018-06-28 18:24:51 -04:00
Shadows_of_Fire 85038e9628 english u stupid shit 2018-06-27 03:23:55 -04:00
Shadows_of_Fire 29534764a9 Closes #1134 2018-06-26 16:25:51 -04:00
Shadows_of_Fire 709b75a043 Fix empowerer; Closes #1130 2018-06-24 14:35:50 -04:00
Shadows_of_Fire 6a46513844 Closes #1128 2018-06-23 22:25:27 -04:00
Shadows_of_Fire 6a02e54888 Closes #1115 2018-06-23 21:23:58 -04:00
Shadows_of_Fire 5c149648da More major updating 
Migrates the rest of the recipe system to Ingredient inputs, Migrates
the compost to an IBakedModel instead of a TESR
 2018-06-23 20:44:47 -04:00
Shadows_of_Fire 5bbca0ee30 Fix count of 2 in ghost slots 2018-06-23 13:27:08 -04:00
Shadows_of_Fire 0b4a870717 Closes #1125 2018-06-23 12:39:59 -04:00
Shadows_of_Fire 06b6511663 Closes #1123 2018-06-23 12:37:41 -04:00
Shadows_of_Fire 00c0c507ca Closes #1121 2018-06-22 22:24:32 -04:00
Shadows_of_Fire ac2bc0124a We're just gonna hope nothing is on fire. 2018-06-22 19:39:30 -04:00
Shadows_of_Fire a571c70457 Closes #1073 
This fix means there is a clear underlying issue with the inventory
structure of AA...  This is going to be quite a big refactor.  Bleh.
 2018-05-31 16:41:13 -04:00
Shadows_of_Fire dca3098631 Closes #1104 2018-05-31 15:29:55 -04:00
Shadows_of_Fire 2595cac472 Closes #1106 
Performance doesn't just show up but maybe these are faster.
 2018-05-31 15:22:02 -04:00
Shadows_of_Fire 54b4f946ea meta is wrong 
n ur code bad bcuz it use meta
 2018-05-21 16:07:03 -04:00
Shadows_of_Fire 37753694f6 Closes #1095 
Probably, anyway, the crash didn't really make sense to begin with, but
this is written like 900x better anyhow.
 2018-05-21 16:02:23 -04:00
Shadows_of_Fire 6eab779e81 Closes #1086 2018-05-10 05:51:20 -04:00
Shadows_of_Fire 3d253aab3e Closes #1078 2018-05-10 05:41:56 -04:00
Shadows_of_Fire 0a1d976ce0 refactor has forgotten u apparently but u fix now 2018-05-10 05:40:16 -04:00
Shadows_of_Fire 505cdc349f reorganized some constants 2018-05-10 05:38:58 -04:00
Shadows_of_Fire dfd54486a3 Closes #1083 2018-05-05 04:01:54 -04:00
Shadows_of_Fire 047c69473b Closes #1084 2018-05-05 03:49:50 -04:00
Konstantin 7608a3af3d Create ru_RU.lang (#1079) 
MC 1.12.2. ActuallyAdditions r134. Sources file - en_US.lang (1260 lines) = ru_RU.lang (1260 lines).
 2018-04-27 02:35:32 -04:00
Shadows_of_Fire b1f913a347 Closes #1064 
apparently we was missin some _
 2018-04-19 20:08:05 -04:00
Shadows_of_Fire e38178daaf oil genrtr 2018-04-14 13:54:08 -04:00
Shadows_of_Fire b91bde4d74 Closes #1061 2018-04-13 13:19:52 -04:00
Shadows_of_Fire 981a0c6ae1 Closes #1072 2018-04-13 12:47:34 -04:00
Shadows_of_Fire 76263a56d9 Probably shouldn't hoe farmland blocks 2018-03-23 19:19:43 -04:00
Ristelle 5b3c3fa46f Updated My own name to reflect new username (#1057) 
Because Using my old username is so 2010.
 2018-03-23 00:27:14 -04:00
Shadows_of_Fire 23aa941579 might assist in #1055 2018-03-23 00:18:57 -04:00
Shadows_of_Fire 54e5cdd5cf remove more meta usage 2018-03-22 23:49:50 -04:00
Shadows_of_Fire 88daf6683d Fixes #1055 2018-03-22 22:53:13 -04:00
Brennan Ward b0efb95e4d meta r bad 
reeeeeeeeeeeeeeeeeeeeeeeeeee
 2018-03-22 16:58:53 -04:00
Shadows_of_Fire 9aaaeb9ed0 Fixes #1043 
Includes a change that might also resolve #1041 in creative mode, but
that's untested.
 2018-03-19 12:50:18 -04:00
Shadows_of_Fire 8cd9c6a095 Closes #1044 2018-03-19 12:05:28 -04:00
Shadows_of_Fire 8bb71ad796 meta is bad pls 2018-03-19 11:46:43 -04:00
Shadows_of_Fire 3fcebcdd05 Fixes #1051 2018-03-16 19:07:15 -04:00
Ellpeck 349640c07f fuck you 2018-03-13 15:19:52 +01:00
Shadows_of_Fire e534728d66 coal not ingot 
-tt
 2018-03-13 00:01:52 -04:00
Shadows_of_Fire 532aa1ca60 Add FastBench Compat, closes #1035 2018-03-06 21:08:25 -05:00
Shadows_of_Fire 7fadd4368f nospampls 2018-02-22 12:33:48 -05:00
The_Fireplace 9ace03bb9f Added en_UD.lang (#1032) 
nice
 2018-02-17 19:02:06 -05:00
Shadows_of_Fire f7c5d9e1e9 Closes #1003 
guis r evil
 2018-02-17 17:00:14 -05:00
Shadows_of_Fire 0507779f60 remove dead config 2018-02-17 16:08:44 -05:00
Shadows_of_Fire 76be3f4fc9 Add atomic reconstructor battery config 
as requested by @Darkosto
The recieve rate is always 0.0166 times the battery size.
 2018-02-17 16:08:40 -05:00
Shadows_of_Fire 890de9e006 fix melon bois ( Closes #1025 ) 2018-02-17 15:59:16 -05:00
Shadows_of_Fire dc1a2d13b8 meta is bad kthx 2018-02-11 20:51:19 -05:00
Shadows_of_Fire 3a56a962b2 bleh 2018-02-11 19:44:15 -05:00
Shadows_of_Fire c2209f0596 Not everything is a BlockCrops 2018-01-31 01:46:37 -05:00
Shadows_of_Fire bfe876f423 Don't cast every IPlantable to BlockBush 2018-01-31 00:07:38 -05:00
Shadows_of_Fire f5ae3240f8 Fixes #1018 2018-01-31 00:07:29 -05:00
Shadows_of_Fire f019fbfcda care about horses 2018-01-29 16:43:14 -05:00
Shadows_of_Fire cd4c1b9d1c big boi's big orders 2018-01-29 16:21:40 -05:00
Shadows_of_Fire 4412c62503 Closes #1014 2018-01-29 03:28:12 -05:00
Shadows_of_Fire 00e99d3611 Smart Feeder Fixes #1017 2018-01-29 03:17:38 -05:00
Shadows_of_Fire 227c227ddd Fixes #1015 
I think.  This is basically the entire method from TiC, with added
boolean returns to support that the drill wanted them.  Probably also
Fixes #996
 2018-01-29 02:17:31 -05:00
Shadows_of_Fire 9670fc7669 check for deny 2018-01-26 02:34:20 -05:00
Shadows_of_Fire 287e43c6ad Fix #1010 2018-01-20 13:39:03 -05:00
dalapo 82de1c3dd2 Add extra null check to canFillFluidType (#1006) 
Prevents crashes when canFillFluidType(null) is called
 2018-01-17 13:22:55 -05:00
Shadows_of_Fire 4e30e7bb3b Fixes #988 2018-01-15 17:15:29 -05:00
Shadows_of_Fire bf451dceb1 Fixes #1005 (removes a debug sysout) 2018-01-15 17:00:32 -05:00
Shadows_of_Fire b21089ad6b Fixes #995 2018-01-14 13:25:36 -05:00
Shadows_of_Fire f17f982dab remov import 2018-01-12 17:48:21 -05:00
Shadows_of_Fire c5dbd778bb git forgot this 2018-01-12 17:47:01 -05:00
Shadows_of_Fire 426b363f8e clarity on oil recipe numbers 2018-01-12 17:46:38 -05:00
canitzp 31b3eaaf30 Redone some old code, tile entities are now saving their nbt to the itemstack again, also the MeeCreeps integration does work now Closes #998 2018-01-05 14:38:06 +01:00
Shadows_of_Fire ce8061261b grow some more to account for speed loss 2018-01-04 14:51:19 -05:00
Shadows_of_Fire beef72d35d remove greenhouse glass tile entity 
I am not sure if this is faster or slower than the old tile entity, but
it certainly is more performant.  Numbers may be adjusted to try and fix
what the old speed was (every 50 ticks)
 2018-01-04 14:40:58 -05:00
Shadows_of_Fire 4493a687ce make aiot accept sword enchantments 2018-01-04 14:27:16 -05:00
Shadows_of_Fire 8a1ed7b14b remove explicit tesla support 
tesla api is ded and this will be more work for 1.13 so rip af
 2017-12-23 15:20:01 -05:00
Shadows_of_Fire 1954da6edb Closes #985 
Actually added a feature for once! (Enchanted book splitting)
Added a transformHook in LensConversionRecipe
Made the booklet have max stack size of 1
Moved the text over a bit on reconstructor recipe pages
 2017-12-12 01:54:15 -05:00
leomil72 9388605e24 Italian localization (#986) 
Added Italian localization
 2017-12-12 00:16:43 -05:00
Shadows_of_Fire 348b1eb92c Better check 2017-12-06 16:25:10 -05:00
Shadows_of_Fire 213716fc46 Block harvesting until tema uses new getDrops 2017-12-06 15:59:18 -05:00
Shadows_of_Fire da573459cb Update state when dropper gui closes (fixes #972) 2017-12-02 13:38:36 -05:00
Shadows_of_Fire 2a751355d7 Adds Sack Blacklist (Closes #974) 
also apparently the common capabilities maven is throwing 403's so i've
set it to the version in my cache.
 2017-12-01 16:19:52 -05:00
Shadows_of_Fire 872e124cd8 bleh 2017-11-30 11:13:58 -05:00
Shadows_of_Fire 3bbf2c3d4a Ensure holding of the sack. Closes #975 2017-11-30 02:58:30 -05:00
tartaric_acid ea06819f38 Update zh_CN language file for 1.12 (#976) 
* Complete part of the translation.

* finish zh_CN language file update

* fix a typo
 2017-11-30 02:48:58 -05:00
Shadows_of_Fire 0d6adca7c7 <> is illegal 2017-11-20 11:46:07 -05:00
Mike Botsko bb1568afbc Fixes typo in biomash manual (#966) 2017-11-17 14:04:46 -05:00
Mike Botsko a23b0a2378 Fixes typo in lens of disenchanting manual 2017-11-16 19:00:55 -08:00
Shadows_of_Fire 9bed6f7ea5 no more lamp sneak 2017-11-15 18:11:17 -05:00
Brennan Ward 6ded1cc7b3
BAD NULL 
remov null via mobil
 2017-11-03 13:37:21 -04:00
Shadows_of_Fire 856d62f78c remov null 2017-11-02 17:49:53 -04:00
Shadows_of_Fire e95da124f1 touch up jei handler 2017-10-31 18:31:34 -04:00
Shadows_of_Fire 585777b9e0 Closes #885 2017-10-31 18:01:15 -04:00
Artemish aaedc88953 Added Compost recipes to JEI 2017-10-30 21:19:48 -05:00
Shadows_of_Fire 05e37320ba Don't pickup things from conveyor belts 2017-10-23 13:08:17 -04:00
Shadows_of_Fire 100b10eb7a no more display stand torches bleh 2017-10-05 18:36:35 -04:00
Shadows_of_Fire 19402f3650 Fixes #929 2017-10-05 09:06:26 -04:00
Xander 2f2de97bf2 don't return internal copy of itemstack on simulate 2017-10-01 13:05:47 +08:00
Shadows_of_Fire 2f505dc24a Fixes #932 2017-09-29 22:47:10 -04:00
Shadows_of_Fire 75f9b17154 fix it for real this time 2017-09-25 15:54:53 -04:00
Shadows_of_Fire dcd8f5207b Fixes #928 2017-09-24 14:32:24 -04:00
Shadows_of_Fire db7daa3343 Closes #884 2017-09-23 02:16:10 -04:00
Shadows_of_Fire 562f0c07e6 Closes #922 2017-09-23 01:55:01 -04:00
Shadows_of_Fire 1fe930b395 switch to new getDrops method 
If this causes issues, its on other people's end to resolve it.  They
should stop overriding the old one.  But, this is basically asking for
trouble.
 2017-09-17 02:47:04 -04:00
Shadows_of_Fire e8058e252a y tho 2017-09-13 12:50:12 -04:00
Shadows_of_Fire cf8e1bbf56 Closes #912 2017-08-30 12:28:35 -04:00
Shadows_of_Fire 1abb89c512 Closes #911 2017-08-27 21:12:20 -04:00
Shadows_of_Fire 65482ada4a doot 2017-08-24 01:02:52 -04:00
Shadows_of_Fire 1e817c3fa9 Fixes #904 finally, probably for the last time 
Also deduplicates multiple entries of say 1 iron ore to LITERALLY EVERY
IRON DUST because that was stupid and just clutter.
 2017-08-24 01:00:33 -04:00
Shadows_of_Fire fa25cbf7b0 Magnet ring now only works in survival/adventure; Closes #903 2017-08-22 20:06:34 -04:00
Shadows_of_Fire 22f9f4440e Closes #904 2017-08-22 20:01:54 -04:00
Shadows_of_Fire 6ef76a16ea more deprecation things, mainly moving away from all uses of getStateFromMeta 
Changes in LensColor, LensMining, and MethodHandler might all catch on
fire, idk.
i checked them and they worked tho so blahr
 2017-08-17 01:06:09 -04:00
Shadows_of_Fire 2d3e90068f Closes #891 
probably, anyway, idk what weights other mods are using tho so whatever
 2017-08-16 05:42:22 -04:00
Shadows_of_Fire e44b13c554 Closes #886 2017-08-11 18:15:09 -04:00
Shadows_of_Fire 2239a8a783 More deprecation stuffs 
1.13 will remove metadata so expect a few more of these for the remainig
getStateFromMeta stuff... Hopefully this doesn't set anything on fire
 2017-08-09 12:20:55 -04:00
Shadows_of_Fire ed736f3c66 final touch on #881 2017-08-08 15:03:24 -04:00
Shadows_of_Fire f9d226cfc9 Closes #881 
Now, this doesn't really work, because putting power in the
reconstructor doesn't cause a block update.  But it exists, and it'll
try its hardest.  But i'm not making the power input cause a block
update.
 2017-08-08 14:28:30 -04:00
Shadows_of_Fire 9aed16c52a Closes #878 
These are vanilla items blargh
 2017-08-08 11:05:44 -04:00
Shadows_of_Fire daefd71504 important 2017-08-08 08:02:04 -04:00
Shadows_of_Fire 2ee695359c Fixes #880 
probably, anyway
 2017-08-08 08:01:28 -04:00
Shadows_of_Fire 64e6df805b how 2 police 2017-08-06 04:29:28 -04:00
Shadows_of_Fire ab76551cde Stop using IFuelHandler and remove fake air block 
also various generics/deprecation stuff cuz wabealwdnamflkaw.
Might put fake air block back if lex doesnt know how to make dummy
blocks work
 2017-08-02 08:01:41 -04:00
Shadows_of_Fire f2b24c3318 Closes #872 
There dad u got ur thingy
also who put these null itemstacks here bad
 2017-08-01 22:20:47 -04:00
Shadows_of_Fire c6c43fe5a8 add ghost block to avoid some broken forge thing 2017-07-30 20:46:08 -04:00
Shadows_of_Fire 5dbd7aa414 Closes #809 2017-07-29 20:53:30 -04:00
Shadows_of_Fire 7a171c939a Closes #578 2017-07-29 19:03:45 -04:00
Shadows_of_Fire 04453f7ca1 make the worm do the thing elpek said it did 
cuz hes a fraud and it was the farmer that did that thing but now the
worm is cool 2
 2017-07-29 00:01:28 -04:00
Shadows_of_Fire ae736f384a un burn the house again 
this should be the last time i swear
 2017-07-28 16:17:52 -04:00
Brennan Ward 912539e81d Might burn down ur house (#868) 
* Various generics/deprecation shit

this might all catch on fire, honestly, but it shouldn't, unless someone
was using the wrong I18n in the wrong place in the first place...

* uncrash the server

depending on where else big dad used the bad I18n this might also still
be crashy crash
 2017-07-28 03:17:50 +02:00
Brennan Ward d5902dee86 Closes #866 2017-07-26 16:51:42 -04:00
Brennan Ward 6042517947 Stuffs (#865) 
* Resolve dupe glitch

Items using custom item entities return false in EntityJoinWorldEvent,
making World#spawnEntity return false, making the stackSize not drop
properly.

* Closes #862

Well, I didn't really check it, but if that returns false that's their
fault.

* Closes #862

A bit of copypaste from ItemHoe never hurt anyone right?
 2017-07-24 11:31:09 +02:00
Brennan Ward 81d106898b Close 856 and update jei usage (#857) 
* use non-dep fluid methods

* start of jei update

* Update to non-dep JEI methods

* Closes #856
 2017-07-19 12:19:49 +02:00
Brennan Ward f317b987f1 Misc QoL changes. (#852) 
* Make shift clicking out of Crates mimic vanilla

Requsted without issue created by tterrag.

* Farmer QoL improvement

Tries to replant immediately after harvesting to waste less time.
Requested without issue by Morpheus1101
 2017-07-17 14:20:53 +02:00
Brennan Ward d93fdaf995 11 (#851) 
(shh)
 2017-07-16 19:34:21 +02:00
Brennan Ward 363bdcef41 sure 
* Closes #849, probably.

* wot
 2017-07-14 23:45:42 +02:00
Brennan Ward 8d28135f3a use isInstance instead of == (#847) 2017-07-12 21:50:12 +02:00
Brennan Ward 2252bb094e Closes #813 (#844) 
* update oil fluid name

* resolve some npe
 2017-07-12 20:19:48 +02:00
Brennan Ward 978d624eeb Closes #839 and #840 (#841) 
* Safeguard against #840

* update Common caps

* Closes #839
 2017-07-08 20:56:24 +02:00
Brennan Ward 9698d345a2 Closes #816 and #819 (#838) 
Align lamps properly with docs
Make light updates smoother as well, and use a better access to the needed blockstate.
 2017-07-08 11:04:57 +02:00