mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 02:45:13 +00:00
Merge master
This commit is contained in:
commit
468d2ec253
7 files changed
+79
-4
No files matched your search
@@ -0,0 +1,17 @@
|
||||
name: Mark stale issues and pull requests
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 0 * * *"
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/stale@v1
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
stale-issue-message: 'This issue is stale because it has been open for a while with no activity. Remove stale label or comment or this will be closed soon.'
|
||||
stale-pr-message: 'This PR is stale because it has been open for a while with no activity. Remove stale label or comment or this will be closed soon.'
|
||||
@@ -222,3 +222,49 @@ scruffylookingmr=13
|
||||
perls=hopperhock
|
||||
unitedmel=1
|
||||
lynnbruh=6
|
||||
electronicru=munchdew
|
||||
papertriangle=0
|
||||
neofreak89=6
|
||||
xenolicious=15
|
||||
cellmembrane=3
|
||||
mr_hacks101=shulk_me_not
|
||||
nerevardzn=9
|
||||
cosmicparticl=15
|
||||
hypnoticharry=2
|
||||
shawndaddy=4
|
||||
quaternary=6
|
||||
nohobo1im=arcanerose
|
||||
granitial=0
|
||||
khryseniox=vinculotus
|
||||
scp_0049=15
|
||||
aero48=13
|
||||
melanx=11
|
||||
aimbait=0
|
||||
iskall85=5
|
||||
xxfinleyjxx=spectrolus
|
||||
tehrevenge=10
|
||||
spiderach=1
|
||||
corey2thousand=2
|
||||
khrami=3
|
||||
asmidus=11
|
||||
namsan=14
|
||||
_shaey_=9
|
||||
stillg0ld=9
|
||||
witherlord00=14
|
||||
profboxleitner=dreadthorne
|
||||
papapuff=10
|
||||
levicc00123=4
|
||||
teaton=fallenKanade
|
||||
xaanit=9
|
||||
harmonicns=11
|
||||
dr_memerino=entropinnyum
|
||||
vtcobaltblood=manastar
|
||||
swampy4321=13
|
||||
xquicscopex=15
|
||||
thisisivan=4
|
||||
sleepyember=6
|
||||
dorkydisco=10
|
||||
lyslev=11
|
||||
zekiegee=2
|
||||
_inari=6
|
||||
hamelesshaliax=2
|
||||
@@ -203,7 +203,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy {
|
||||
setDelay(cmp.getInt(TAG_DELAY));
|
||||
setRotation(cmp.getFloat(TAG_ROTATION));
|
||||
}
|
||||
|
||||
|
||||
public boolean isCharging() {
|
||||
return dataManager.get(CHARGING);
|
||||
}
|
||||
|
||||
@@ -53,7 +53,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
|
||||
private void onEntityDamaged(LivingHurtEvent event) {
|
||||
if(event.getSource().getImmediateSource() instanceof PlayerEntity
|
||||
&& event.getEntityLiving() instanceof MobEntity
|
||||
&& !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) {
|
||||
&& !event.getEntityLiving().world.isRemote
|
||||
&& event.getEntityLiving().isNonBoss()
|
||||
&& Math.random() < 0.6F) {
|
||||
Runnable lambda = () -> {
|
||||
MobEntity target = (MobEntity) event.getEntityLiving();
|
||||
PlayerEntity player = (PlayerEntity) event.getSource().getImmediateSource();
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
r1.10-362
|
||||
r1.10-363
|
||||
@@ -1,3 +1,12 @@
|
||||
r1.10 363
|
||||
* This is the final release for Minecraft 1.12.x. Thanks for all the support!
|
||||
* Diva Charm no longer brainwashes boss mobs
|
||||
* Remove GregTech blacklist from Orechid since it's no longer necessary
|
||||
* Fix Albedo compatibility (Hubry)
|
||||
* Fix shedding page crash (Hubry)
|
||||
* Fix error when equipping Botania baubles over other new Baubles (Hubry)
|
||||
* Fix lexicon sharing crashing when in off hand (Hubry)
|
||||
* Add Quartz blocks to Ore Dictionary (nekosune)
|
||||
r1.10 362
|
||||
*When matching recipe tags, also match the first items of nested lists. (codewarrior0)
|
||||
*Fix magnet ring working in spectator mode
|
||||
|
||||
+2
-1
@@ -313,4 +313,5 @@ r1.10-358=1.12.2
|
||||
r1.10-359=1.12.2
|
||||
r1.10-360=1.12.2
|
||||
r1.10-361=1.12.2
|
||||
r1.10-362=1.12.2
|
||||
r1.10-362=1.12.2
|
||||
r1.10-363=1.12.2
|
||||
Reference in new issue
Block a user